1
--- solenv/inc/startup/startup.mk.orig 2008-10-21 09:41:14.000000000 +0200
2
+++ solenv/inc/startup/startup.mk 2008-10-21 09:52:19.000000000 +0200
3
@@ -40,9 +40,20 @@ CALLTARGETS=$(MAKETARGETS)
7
-# Customize macro definitions based on seting of OS.
8
-# This must come before the default macro definitions which follow.
9
-.INCLUDE .NOINFER : $(INCFILENAME:d)$(OS)$/macros.mk
10
+# Customize macro definitions based on seting of BUILD_OS, after
11
+# translation into a third naming scheme (1. config.guess,
12
+# 2. configure.in) devised in 3. set_soenv.in: $B_OS.
13
+.IF "$(CROSS_COMPILING)" == "no"
15
+.ELSE # "$(CROSS_COMPILING)" == "yes"
16
+.IF "$(BUILD_OS)" == "Linux"
18
+.ELSE # "$(BUILD_OS)" != "Linux"
19
+.ERROR : ; @echo Work in progress: cross compiling only on Linux
21
+.ENDIF # "$(CROSS_COMPILING)" != "yes"
23
+.INCLUDE .NOINFER : $(INCFILENAME:d)$(B_OS)$/macros.mk
25
# ----------------- Default Control Macro definitions -----------------------
26
# Select appropriate defaults for basic macros
27
--- solenv/bin/build.pl.orig 2008-07-22 18:46:59.000000000 +0200
28
+++ solenv/bin/build.pl 2008-10-21 10:58:44.000000000 +0200
30
my $enable_multiprocessing = 1;
32
$cygwin++ if ($^O eq 'cygwin');
33
- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
34
+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
35
eval { require Win32::Process; import Win32::Process; };
36
$enable_multiprocessing = 0 if ($@);
38
@@ -812,7 +838,7 @@ sub CorrectPath {
40
#print "Checking dmake...";
41
# my $dmake_batch = CorrectPath("$tmp_dir/dmake.bat");
42
- if ($QuantityToBuild && ($ENV{GUI} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) {
43
+ if ($QuantityToBuild && ($ENV{BUILD_OS} eq 'WNT') && ($ENV{USE_SHELL} eq '4nt')) {
44
if (open(DMAKEVERSION, "where dmake |")) {
45
my @output = <DMAKEVERSION>;
47
@@ -857,7 +883,7 @@ sub get_commands {
48
while ($arg = pop(@dmake_args)) {
51
-# if (($ENV{GUI} eq 'WNT') && $QuantityToBuild) {
52
+# if (($ENV{BUILD_OS} eq 'WNT') && $QuantityToBuild) {
53
# print_error("There is no such executable $_4nt_exe") if (!-e $_4nt_exe);
54
# $dmake_batch = generate_4nt_batch();
56
@@ -873,7 +899,7 @@ sub get_commands {
57
# ($ENV{GUI} eq 'MACOSX')) &&
60
-# } elsif ( (($ENV{GUI} eq 'WNT') ||
61
+# } elsif ( (($ENV{BUILD_OS} eq 'WNT') ||
62
# ($ENV{GUI} eq 'WIN') ||
63
# ($ENV{GUI} eq 'OS2')) &&
64
# ($Dir =~ /\S:\/$/)) {
65
@@ -933,7 +959,7 @@ sub CheckPlatform {
66
return 1 if (($ENV{GUI} eq 'WIN') && ($Platform eq 'w'));
67
return 1 if (($ENV{GUI} eq 'UNX') && ($Platform eq 'u'));
68
return 1 if (($ENV{GUI} eq 'OS2') && ($Platform eq 'p'));
69
- return 1 if (($ENV{GUI} eq 'WNT') &&
70
+ return 1 if ((($ENV{TARGET_OS} eq 'WNT') || ($ENV{TARGET_OS} eq 'MinGW')) &&
71
(($Platform eq 'w') || ($Platform eq 'n')));
74
@@ -1378,7 +1409,7 @@ sub cancel_build {
76
print "\nAttention: if you build and deliver the above module(s) you may prolongue your the build issuing command \"build --from @broken_modules_names\"\n";
78
-# if ($ENV{GUI} eq 'WNT') {
79
+# if ($ENV{BUILD_OS} eq 'WNT') {
80
while (children_number()) {
81
handle_dead_children(1);
83
@@ -1400,7 +1431,7 @@ sub store_error {
84
my ($pid, $error_code) = @_;
85
return 0 if (!$error_code);
86
my $child_nick = $processes_hash{$pid};
87
- if ($ENV{GUI} eq 'WNT') {
88
+ if ($ENV{BUILD_OS} eq 'WNT') {
89
if (!defined $had_error{$child_nick}) {
90
$had_error{$child_nick}++;
92
@@ -1429,7 +1460,7 @@ sub handle_dead_children {
93
my $try_once_more = 0;
96
- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
97
+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
98
foreach $pid (keys %processes_hash) {
99
my $exit_code = undef;
100
my $proc_obj = $windows_procs{$pid};
101
@@ -1552,7 +1583,7 @@ sub start_child {
102
# html_store_job_info($dependencies_hash, $job_dir, $error_code);
104
# # give windows (4nt) one more chance
105
-# if ($ENV{GUI} eq 'WNT' && !$cygwin) {
106
+# if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
107
# $error_code = do_post_job($`, $post_job, $dependencies_hash);
110
@@ -1569,7 +1600,7 @@ sub start_child {
111
my $children_running;
112
my $oldfh = select STDOUT;
114
- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
115
+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
117
my $process_obj = undef;
118
my $rc = Win32::Process::Create($process_obj, $dmake_bin,
119
@@ -1725,7 +1756,7 @@ sub do_custom_job {
120
$error_code = run_job($job, CorrectPath($StandDir.$module), $module_job);
122
# give windows (4nt) one more chance
123
- if ($ENV{GUI} eq 'WNT' && !$cygwin) {
124
+ if ($ENV{BUILD_OS} eq 'WNT' && !$cygwin) {
125
$error_code = run_job($job, CorrectPath($StandDir.$module), $module_job);
128
@@ -3180,7 +3211,7 @@ sub html_store_job_info {
130
sub start_server_on_port {
132
- if ($ENV{GUI} eq 'WNT') {
133
+ if ($ENV{BUILD_OS} eq 'WNT') {
134
$socket_obj = new IO::Socket::INET (#LocalAddr => hostname(),
137
--- solenv/bin/deliver.pl.orig 2008-10-21 10:52:30.000000000 +0200
138
+++ solenv/bin/deliver.pl 2008-10-21 10:58:49.000000000 +0200
139
@@ -140,7 +140,7 @@ parse_options();
140
print "$script_name -- version: $script_rev\n" if !$opt_silent;
142
if ( ! $opt_delete ) {
143
- if ( $ENV{GUI} eq 'WNT' ) {
144
+ if ( $ENV{BUILD_OS} eq 'WNT' ) {
145
if ($ENV{COM} eq 'GCC') {
148
@@ -411,7 +411,7 @@ sub parse_options
149
$arg =~ /^-delete$/ and $opt_delete = 1 and next;
150
$arg =~ /^-dontdeletecommon$/ and $dontdeletecommon = 1 and next;
151
$arg =~ /^-help$/ and $opt_help = 1 and $arg = '';
152
- $arg =~ /^-link$/ and $ENV{GUI} ne 'WNT' and $opt_link = 1 and next;
153
+ $arg =~ /^-link$/ and $ENV{BUILD_OS} ne 'WNT' and $opt_link = 1 and next;
154
$arg =~ /^-deloutput$/ and $opt_deloutput = 1 and next;
155
$arg =~ /^-debug$/ and $is_debug = 1 and next;
156
$arg =~ /^-checkdlst$/ and $opt_checkdlst = 1 and next;
157
@@ -711,7 +711,7 @@ sub is_unstripped {
158
# OS X file command doesn't know if a file is stripped or not
159
if (($file_type =~ /not stripped/o) || ($file_type =~ /Mach-O/o) ||
160
(($file_type =~ /PE/o) && ($ENV{GUI} eq 'WNT') &&
161
- ($nm_output = `nm $file_name 2>&1`) && $nm_output &&
162
+ ($nm_output = `$(NM) $file_name 2>&1`) && $nm_output &&
163
!($nm_output =~ /no symbols/i) && !($nm_output =~ /not recognized/i))) {
164
return '1' if ($file_name =~ /\.bin$/o);
165
return '1' if ($file_name =~ /\.so\.*/o);
166
@@ -1485,7 +1485,7 @@ sub usage
167
print STDERR " -force copy even if not newer\n";
168
print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n";
169
print STDERR " -help print this message\n";
170
- if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
171
+ if ( !defined($ENV{BUILD_OS}) || $ENV{BUILD_OS} ne 'WNT' ) {
172
print STDERR " -link hard link files into the solver to save disk space\n";
174
print STDERR " -minor deliver into minor (milestone)\n";
175
--- solenv/inc/unitools.mk.pristine 2008-10-21 11:31:04.000000000 +0200
176
+++ solenv/inc/unitools.mk 2008-10-21 13:54:42.000000000 +0200
177
@@ -39,7 +39,7 @@ XSLTPROC*=xsltproc
181
-MAKEDEPEND*=$(SOLARBINDIR)$/makedepend
182
+MAKEDEPEND*=$(TOOLS_DIR)/makedepend
184
SCP_CHECK_TOOL:=checkscp$E
186
--- solenv/inc/settings.mk.pristine 2008-10-29 08:42:08.000000000 +0100
187
+++ solenv/inc/settings.mk 2008-10-30 10:01:59.000000000 +0100
188
@@ -752,7 +752,7 @@ COMMONBIN=$(LOCAL_COMMON_OUT)$/bin
190
INCPCH=$(PRJ)$/inc$/pch
192
-INCGUI=$(PRJ)$/$(GUIBASE)$/inc
193
+INCGUI=$(PRJ)$/$(GUIBASE:l)$/inc
196
INCUNOIDL=$(INCCOM)$/$(PRJNAME)
197
@@ -1050,7 +1050,11 @@ JAVA*:=$(JAVAINTERPRETER)
198
SCPCOMP=$(PERL) $(SOLARENV)$/bin$/pre2par.pl
199
SCPLINK=$(PERL) $(SOLARENV)$/bin$/par2script.pl
201
+.IF "$(GUI)" == "UNX" || "$(BUILD_OS)" != "WNT"
207
.IF "$(DISABLE_ENHANCED_COMID)"==""
208
.INCLUDE : tg_compv.mk
added
removed
ooo-build/patches/dev300/crosswin32-solenv-cross.diff
