[Lunar-commits] r26926 - in moonbase: branches/deleted-modules branches/deleted-modules/gcc42 trunk/compilers trunk/compilers/gcc trunk/compilers/gcc3 trunk/devel/gdb
Moritz Heiber
moe at lunar-linux.org
Mon Nov 26 15:29:53 CET 2007
Author: moe
Date: 2007-11-26 15:29:53 +0100 (Mon, 26 Nov 2007)
New Revision: 26926
Added:
moonbase/branches/deleted-modules/gcc42/
Removed:
moonbase/trunk/compilers/gcc42/
Modified:
moonbase/branches/deleted-modules/gcc42/BUILD.x86_64
moonbase/trunk/compilers/gcc/BUILD
moonbase/trunk/compilers/gcc/BUILD.x86_64
moonbase/trunk/compilers/gcc/CONFIGURE
moonbase/trunk/compilers/gcc/DEPENDS
moonbase/trunk/compilers/gcc/DETAILS
moonbase/trunk/compilers/gcc/POST_INSTALL
moonbase/trunk/compilers/gcc3/POST_INSTALL
moonbase/trunk/devel/gdb/BUILD
Log:
Update gcc to 4.2.2. Remove gcc42 (no longer needed). Adjust POST_INSTALLS
accordingly. Sneak in a minor BUILD fix for gdb so it doesn't conflict with
binutils anymore. Praise Ratler for adding lvu conflicts.
Copied: moonbase/branches/deleted-modules/gcc42 (from rev 26867, moonbase/trunk/compilers/gcc42)
Modified: moonbase/branches/deleted-modules/gcc42/BUILD.x86_64
===================================================================
--- moonbase/trunk/compilers/gcc42/BUILD.x86_64 2007-11-21 16:55:47 UTC (rev 26867)
+++ moonbase/branches/deleted-modules/gcc42/BUILD.x86_64 2007-11-26 14:29:53 UTC (rev 26926)
@@ -18,7 +18,8 @@
--with-gnu-ld \
--with-system-zlib \
--enable-shared \
- --disable-multilib &&
+ --disable-multilib \
+ $OPTS &&
make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean &&
prepare_install &&
Modified: moonbase/trunk/compilers/gcc/BUILD
===================================================================
--- moonbase/trunk/compilers/gcc/BUILD 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc/BUILD 2007-11-26 14:29:53 UTC (rev 26926)
@@ -1,28 +1,32 @@
(
- mkdir BUILD &&
- cd BUILD &&
+ mkdir BUILD &&
+ cd BUILD &&
- sedit 's/trap 0/trap "" 0/' ../configure &&
+ 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 \
- --enable-shared &&
+ LANGUAGES="${LANGUAGES:=c++}" &&
-# sedit 's/= install-headers-tar/= install-headers-cpio/' gcc/Makefile &&
+ if in_depends gcc mpfr ; then
+ LANGUAGES="${LANGUAGES},fortran"
+ fi
+ ../configure --host=$BUILD \
+ --enable-languages=$LANGUAGES \
+ --prefix=${MODULE_PREFIX} \
+ --infodir=${MODULE_PREFIX}/share/info \
+ --mandir=${MODULE_PREFIX}/share/man \
+ --enable-__cxa_atexit \
+ --enable-threads \
+ --disable-nls \
+ --enable-target-optspace \
+ --with-gnu-ld \
+ --with-system-zlib \
+ --enable-shared \
+ $OPTS &&
+
make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean &&
- prepare_install &&
+ prepare_install &&
make install
) > $C_FIFO 2>&1
Modified: moonbase/trunk/compilers/gcc/BUILD.x86_64
===================================================================
--- moonbase/trunk/compilers/gcc/BUILD.x86_64 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc/BUILD.x86_64 2007-11-26 14:29:53 UTC (rev 26926)
@@ -1,30 +1,33 @@
(
- mkdir BUILD &&
- patch_it $SOURCE_CACHE/$SOURCE2 0 &&
- cd BUILD &&
+ mkdir BUILD &&
+ cd BUILD &&
- sedit 's/trap 0/trap "" 0/' ../configure &&
+ 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 \
- --enable-shared \
- --disable-multilib &&
+ LANGUAGES=${LANGUAGES:=c++} &&
-# sedit 's/= install-headers-tar/= install-headers-cpio/' gcc/Makefile &&
+ if in_depends gcc mpfr ; then
+ LANGUAGES="${LANGUAGES},fortran"
+ fi
+ ../configure --host=$BUILD \
+ --enable-languages=$LANGUAGES \
+ --prefix=${MODULE_PREFIX} \
+ --infodir=${MODULE_PREFIX}/share/info \
+ --mandir=${MODULE_PREFIX}/share/man \
+ --enable-__cxa_atexit \
+ --enable-threads \
+ --disable-nls \
+ --enable-target-optspace \
+ --with-gnu-ld \
+ --with-system-zlib \
+ --enable-shared \
+ --disable-multilib \
+ $OPTS &&
+
make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean &&
- prepare_install &&
+ prepare_install &&
make install
) > $C_FIFO 2>&1
Modified: moonbase/trunk/compilers/gcc/CONFIGURE
===================================================================
--- moonbase/trunk/compilers/gcc/CONFIGURE 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc/CONFIGURE 2007-11-26 14:29:53 UTC (rev 26926)
@@ -7,7 +7,6 @@
if query "Do you want to select additional compiler languages ? " n ; then
OPTIONS=(
- "fortran" "Fortran" "off"
"java" "Java" "off"
"objc" "Objective C" "off"
)
Modified: moonbase/trunk/compilers/gcc/DEPENDS
===================================================================
--- moonbase/trunk/compilers/gcc/DEPENDS 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc/DEPENDS 2007-11-26 14:29:53 UTC (rev 26926)
@@ -1 +1 @@
-optional_depends "mpfr" " " " " "if you want gfortran"
+optional_depends "mpfr" "" "" "to compile fortran support"
Modified: moonbase/trunk/compilers/gcc/DETAILS
===================================================================
--- moonbase/trunk/compilers/gcc/DETAILS 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc/DETAILS 2007-11-26 14:29:53 UTC (rev 26926)
@@ -1,13 +1,13 @@
MODULE=gcc
- VERSION=4.1.2
+ VERSION=4.2.2
SOURCE=$MODULE-$VERSION.tar.bz2
SOURCE_URL[0]=$GNU_URL/gcc/$MODULE-$VERSION/
SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/gcc/$MODULE-$VERSION/
SOURCE_URL[2]=http://www.online-mirror.org/gcc/$MODULE-$VERSION/
- SOURCE_VFY=sha1:7981b8d1b58b10ddfd7d5142eab16352d9206f3b
+ SOURCE_VFY=sha1:dcf2139e0f318850d475a6af3dcd5f176f1acb0e
WEB_SITE=http://gcc.gnu.org
ENTERED=20020628
- UPDATED=20070306
+ UPDATED=20071126
PSAFE=no
SHORT="GNU compiler collection."
Modified: moonbase/trunk/compilers/gcc/POST_INSTALL
===================================================================
--- moonbase/trunk/compilers/gcc/POST_INSTALL 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc/POST_INSTALL 2007-11-26 14:29:53 UTC (rev 26926)
@@ -3,10 +3,6 @@
remove_module gcc3
fi
-if module_installed gcc42 ; then
- remove_module gcc42
-fi
-
cd /usr/lib/gcc/$BUILD/$VERSION &&
ln -sf /usr/bin/cpp cpp &&
cd /lib/ &&
Modified: moonbase/trunk/compilers/gcc3/POST_INSTALL
===================================================================
--- moonbase/trunk/compilers/gcc3/POST_INSTALL 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/compilers/gcc3/POST_INSTALL 2007-11-26 14:29:53 UTC (rev 26926)
@@ -3,10 +3,6 @@
remove_module gcc
fi
-if module_installed gcc42 ; then
- remove_module gcc42
-fi
-
cd /usr/lib/gcc/$BUILD/$VERSION &&
ln -sf /usr/bin/cpp cpp &&
cd /lib/ &&
Modified: moonbase/trunk/devel/gdb/BUILD
===================================================================
--- moonbase/trunk/devel/gdb/BUILD 2007-11-26 13:44:45 UTC (rev 26925)
+++ moonbase/trunk/devel/gdb/BUILD 2007-11-26 14:29:53 UTC (rev 26926)
@@ -1,6 +1,8 @@
(
- OPTS+=" --host=$BUILD" &&
+ OPTS+=" --host=$BUILD --libdir=$MODULE_PREFIX/lib/gdb \
+ --includedir=$MODULE_PREFIX/include/gdb" &&
+
default_build
) > $C_FIFO 2>&1
More information about the Lunar-commits
mailing list