[Lunar-commits] CVS: moonbase/compilers/gcc/3.4.3 BUILD, 1.1, 1.2 CONFIGURE, 1.1, 1.2 POST_INSTALL, 1.1, 1.2

[Auke Kok]

Update of /var/cvs/lunar/moonbase/compilers/gcc/3.4.3
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/compilers/gcc/3.4.3

Modified Files:
	BUILD CONFIGURE POST_INSTALL 
Log Message:
This should do the trick. note the change in path in POST_INSTALL and slight adjustment of BUILD


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/gcc/3.4.3/BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BUILD	6 Nov 2004 23:05:25 -0000	1.1
+++ BUILD	14 Dec 2004 21:29:40 -0000	1.2
@@ -3,24 +3,26 @@
   mkdir BUILD                                &&
   cd BUILD                                   &&
 
+  sedit 's/= install-headers-tar/= install-headers-cpio/' gcc/config.build  &&
   sedit 's/trap 0/trap "" 0/' ../configure   &&
 
   LANGUAGES=${LANGUAGES:=c++}                &&
-  ../configure --host=$BUILD                  \
-               --enable-languages=$LANGUAGES  \
-               --prefix=/usr                  \
-               --infodir=/usr/share/info      \
-               --mandir=/usr/share/man        \
-               --enable-__cxa_atexit          \
-               --enable-threads               \
-               --disable-nls                  \
-               --enable-target-optspace       \
-               --with-gnu-ld                  \
-               --with-system-zlib             \
+  ../configure --host=$BUILD                 \
+               --enable-languages=$LANGUAGES \
+               --prefix=/usr                 \
+               --infodir=/usr/share/info     \
+               --mandir=/usr/share/man       \
+               --enable-__cxa_atexit         \
+               --enable-threads              \
+               --disable-nls                 \
+               --enable-target-optspace      \
+               --with-gnu-ld                 \
+               --with-system-zlib            \
                --enable-shared               &&
 
+
   make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&
-  prepare_install  && 
+  prepare_install                            && 
   make install
 
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/gcc/3.4.3/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	6 Nov 2004 23:05:25 -0000	1.1
+++ CONFIGURE	14 Dec 2004 21:29:40 -0000	1.2
@@ -2,11 +2,8 @@
 # only lin -r gcc will trigger the language selector!
 if [ -n "$RECONFIGURE" ] ; then
 
-  if ! grep -q LANGUAGES $MODULE_CONFIG ; then
-    [ -z "$LANGUAGES" ]  && LANGUAGES=${LANGUAGES:=c++}
-  else
-    eval $(echo $MODULE_CONFIG)
-  fi
+  LANGUAGES=$(get_module_config LANGUAGES)
+  [ -z "$LANGUAGES" ]  && LANGUAGES=${LANGUAGES:=c++}
 
   if query "Do you want to select additional compiler languages ? " n ; then
     OPTIONS=(
@@ -22,14 +19,13 @@
                    "${OPTIONS[@]}"`
 
     LANGUAGES="c++,$(echo $RESULT | sed 's/ /,/g')"
-    echo "LANGUAGES=\"$LANGUAGES\"" >> $MODULE_CONFIG 
+    set_module_config LANGUAGES "$LANGUAGES"
 
   else
 
-    if ! grep -q LANGUAGES $MODULE_CONFIG ; then
-      [ -z "$LANGUAGES" ]  && LANGUAGES=${LANGUAGES:=c++}
-      echo "LANGUAGES=\"$LANGUAGES\"" >> $MODULE_CONFIG
-    fi
+    LANGUAGES=$(get_module_config LANGUAGES)
+    [ -z "$LANGUAGES" ]  && LANGUAGES=${LANGUAGES:=c++}
+    set_module_config LANGUAGES "$LANGUAGES"
 
   fi
 

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/gcc/3.4.3/POST_INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POST_INSTALL	6 Nov 2004 23:05:25 -0000	1.1
+++ POST_INSTALL	14 Dec 2004 21:29:40 -0000	1.2
@@ -1,15 +1,8 @@
 
-cd /usr/lib/gcc/$BUILD/$VERSION            &&
-ln    -sf /usr/bin/cpp cpp                 &&
-cd /lib/                                   &&
-ln    -sf /usr/bin/cpp cpp                 && 
+ln -sf /usr/bin/cpp /usr/lib/gcc/$BUILD/$VERSION/cpp
+ln -sf /usr/bin/cpp /lib/cpp
 
 if [ ! -e /usr/bin/cc ] ; then
   ln -s gcc /usr/bin/cc
-fi                                         &&
-
-rm_source_dir /usr/src/gcc-$VERSION-BUILD  &&
-rm_source_dir /usr/src/gcc-$VERSION        &&
-
-ldconfig
+fi