[Lunar-commits] CVS: moonbase/compilers/gcc BUILD, 1.11, 1.12 DETAILS, 1.17, 1.18 PRE_BUILD, 1.8, NONE

[Auke Kok]

Update of /var/cvs/lunar/moonbase/compilers/gcc
In directory espresso.foo-projects.org:/tmp/cvs-serv17429

Modified Files:
	BUILD DETAILS 
Removed Files:
	PRE_BUILD 
Log Message:
Cleaning this up: you should never directly use '/usr/src' and BUILD can perfectly be WITHIN the buildroot without hacks.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/gcc/BUILD,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- BUILD	5 Aug 2004 09:05:18 -0000	1.11
+++ BUILD	3 Nov 2004 22:08:26 -0000	1.12
@@ -1,11 +1,12 @@
 (
-  sedit 's/trap 0/trap "" 0/' ../gcc-$VERSION/configure &&
 
-  # next line will aid in recognizing which languages were selected
-  # so we output it here:
-  set -x                                     &&
+  mkdir BUILD                                &&
+  cd BUILD                                   &&
+
+  sedit 's/trap 0/trap "" 0/' ../configure   &&
+
   LANGUAGES=${LANGUAGES:=c++}                &&
-  ../gcc-$VERSION/configure  --host=$BUILD   \
+  ../configure --host=$BUILD                 \
                --enable-languages=$LANGUAGES \
                --prefix=/usr                 \
                --infodir=/usr/share/info     \
@@ -17,16 +18,11 @@
                --with-gnu-ld                 \
                --with-system-zlib            \
                --enable-shared               &&
-  set +x                                     &&
+
   sedit 's/= install-headers-tar/= install-headers-cpio/' gcc/Makefile  &&
-  make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean                            &&
-  OLD_PATH=$PATH			     &&
-  PATH=$PATH:/usr/src/gcc-{$VERSION}-BUILD/gcc    &&
-  OLD_LD_PATH=$LD_LIBRARY_PATH		     &&
-  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/src/gcc-{$VERSION}-BUILD/old.libraries &&
+
+  make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&
   prepare_install                            && 
-  make install  			     &&                             
-  PATH=$OLD_PATH                             &&
-  LD_LIBRARY_PATH=$OLD_LD_PATH
-) > $C_FIFO 2>&1
+  make install
 
+) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/gcc/DETAILS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- DETAILS	5 Oct 2004 09:29:53 -0000	1.17
+++ DETAILS	3 Nov 2004 22:08:26 -0000	1.18
@@ -2,7 +2,6 @@
          VERSION=3.3.3
         #VERSION=3.2.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-BUILD
    SOURCE_URL[0]=$GNU_URL/gcc/releases/$MODULE-$VERSION/
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/gcc/releases/$MODULE-$VERSION/
    SOURCE_URL[2]=http://www.online-mirror.org/gcc/releases/$MODULE-$VERSION/

--- PRE_BUILD DELETED ---