Author: arist
Date: Thu Nov 15 00:12:08 2012
New Revision: 1409595
URL: http://svn.apache.org/viewvc?rev=1409595&view=rev
Log:
gnumake4_142_3c81abff5843.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1303142355 0
# Node ID 3c81abff5843ba09130c456474fc83b094435e64
# Parent ad05b3eaeb226299abef2ffd5f361a778d8cacf7
gnumake4: #i117687#: do not source *Env.Set.sh in bootstrap
Modified:
incubator/ooo/branches/gbuild/main/bootstrap.1
incubator/ooo/branches/gbuild/main/set_soenv.in
Modified: incubator/ooo/branches/gbuild/main/bootstrap.1
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/bootstrap.1?rev=1409595&r1=1409594&r2=1409595&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/bootstrap.1 (original)
+++ incubator/ooo/branches/gbuild/main/bootstrap.1 Thu Nov 15 00:12:08 2012
@@ -19,6 +19,15 @@
#
# *************************************************************
+# remove aliases set by *Env.Set.sh
+unalias mkout
+unalias deliver
+unalias build
+unalias build_client
+unalias zipdep
+unalias nmake
+unalias gunzip
+
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
# Use spawn instead of fork when building dmake on cygwin.
if test "$GUI" = "WNT"; then
Modified: incubator/ooo/branches/gbuild/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/set_soenv.in?rev=1409595&r1=1409594&r2=1409595&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/set_soenv.in (original)
+++ incubator/ooo/branches/gbuild/main/set_soenv.in Thu Nov 15 00:12:08 2012
@@ -2089,9 +2089,6 @@ ToFile( "ZIPDEP", $perlpre."zipde
#
# Writing the aliases to file.
ToFile( "Aliases.", $empty, "c" );
-ToFile( "Don't set aliases when bootstrapping", $empty, "c" );
-ToFile( 'if ( ! ${?_ISBOOTSTRAP_} ) then', $empty, "y");
-ToFile( "if test -z \"\$_ISBOOTSTRAP_\"; then", $empty, "z");
ToFile( "alias mkout", $mkout, "a" );
ToFile( "alias deliver", $deliver, "a" );
@@ -2105,20 +2102,6 @@ if ( $platform =~ m/os2/ )
{ ToFile( "alias gunzip", "gzip -d", "a" );
}
-ToFile( "endif", $empty, "y");
-ToFile( "fi", $empty, "z");
-
-# Check if the right dmake version is used. (W32 only)
-if ( $platform =~ m/cygwin/ ) {
- ToFile( "Check if the right dmake version is used.", $empty, "c" );
- # Invalidate build environment.
- ToFile( "WORK_STAMP", "_invalid_", "e" );
- # Don't test the dmake version if this file is sourced by bootstrap
- ToFile( "bash -c 'if test -n \"\$_ISBOOTSTRAP_\" || (dmake.exe -V | grep
-e \"-cygwin\\|OS := cygwin\" > /dev/null ); then true; else echo -e
\"\\n\\nERROR: Not a cygwin build dmake or dmake missing, please check!\\n\\n\"
; sleep 5; false ; fi' || exit 1", $empty, "y");
- # Restore valid environment if test was successful.
- ToFile( "WORK_STAMP", $WORK_STAMP, "e" );
- ToFile( "", $empty, "n");
-}
# on Solaris, MacOSX and FreeBSD (and Windows) set GNUPATCH and GPERF
if ($platform =~ m/solaris|darwin|freebsd|cygwin/)
@@ -2228,8 +2211,6 @@ $bootfile = "bootstrap";
open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n";
-print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; .
$SRC_ROOT/$outfile.sh\n";
-print OUT "unset _ISBOOTSTRAP_; export _ISBOOTSTRAP_\n";
if ( $MINGW eq "yes" )
{ print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; }
close( OUT ) || print "Can't close $bootfile: $!";
