Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-gcc-parallel grimoire by David Brown (4782d404bd4d44b993944274e932c69033b2b0c2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-gcc-parallel grimoire by David Brown (4782d404bd4d44b993944274e932c69033b2b0c2)
  • Date: Sat, 20 Oct 2007 16:51:36 -0500

GIT changes to devel-gcc-parallel grimoire by David Brown
<dmlb2000 AT gmail.com>:

gnu/g++/BUILD | 11 ++++++++++-
gnu/g++/FINAL | 5 ++++-
gnu/g++/HISTORY | 6 ++++++
gnu/g++/INSTALL | 27 +++++++++++++++++----------
gnu/g++/PRE_BUILD | 3 ++-
gnu/gcc/BUILD | 18 +++++++++++++++++-
gnu/gcc/FINAL | 3 +++
gnu/gcc/HISTORY | 6 ++++++
gnu/gcc/INSTALL | 44 ++++++++++++++++----------------------------
gnu/gcc/PRE_BUILD | 1 +
10 files changed, 82 insertions(+), 42 deletions(-)

New commits:
commit 4782d404bd4d44b993944274e932c69033b2b0c2
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

g++ installed to stage area then to system adding program prefix as well

commit 7d9cde0273558dec9b014ec385999dc52e26abb8
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

gcc installed to stage area then to system adding program prefix as well

diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index 993e5f8..22b01e7 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -25,10 +25,19 @@ $SOURCE_DIRECTORY/configure
\
--infodir=${INSTALL_ROOT}/usr/share/info \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-threads=posix \
+ --program-suffix=-${VERSION%.*} \
--with-system-zlib \
--enable-languages=c++ \
$GCC_MULTILIB \
$OPTS &&

make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
- profiledbootstrap
+ profiledbootstrap &&
+make -C gcc DESTDIR=$SOURCE_DIRECTORY.install lang.install-common
lang.install-man &&
+install -c gcc/cc1plus
$SOURCE_DIRECTORY.install/usr/libexec/gcc/$HOST/$VERSION/ &&
+make -C $HOST/libstdc++-v3/ DESTDIR=$SOURCE_DIRECTORY.install install &&
+
+# specs file stuff
+local SPECSDIR=$SOURCE_DIRECTORY.install/usr/lib/gcc/$HOST/$VERSION &&
+mkdir -p $SPECSDIR/specs-local &&
+cp $SCRIPT_DIRECTORY/specs_g++ $SPECSDIR/specs-local
diff --git a/gnu/g++/FINAL b/gnu/g++/FINAL
index 14a9914..39e5638 100755
--- a/gnu/g++/FINAL
+++ b/gnu/g++/FINAL
@@ -1,3 +1,6 @@
rm_source_dir $SOURCE_DIRECTORY.bld &&
+rm_source_dir $SOURCE_DIRECTORY.install &&
local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
+cat $SPECSDIR/specs-local/* > $SPECSDIR/specs &&
+ln -sf g++-${VERSION%.*} ${INSTALL_ROOT}/usr/bin/g++ &&
+ln -sf c++-${VERSION%.*} ${INSTALL_ROOT}/usr/bin/c++
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index 3e637ff..f929cc8 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,3 +1,9 @@
+2007-10-20 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: added install to stage area and program prefix
+ * FINAL: removed stage area
+ * INSTALL: installed g++ from stage area to system
+ * PRE_BUILD: created stage area
+
2007-10-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 4.2.2
fixed WEB_SITE
diff --git a/gnu/g++/INSTALL b/gnu/g++/INSTALL
index 9b93368..d4bbdb5 100755
--- a/gnu/g++/INSTALL
+++ b/gnu/g++/INSTALL
@@ -1,13 +1,20 @@
#
-# Bug #10647, also fixed in devel Sorcery
+# Bug #10647, also fixed in devel Sorcery
#
-cd $SOURCE_DIRECTORY.bld &&
+cd $SOURCE_DIRECTORY.install &&
+local libdir=lib
+[[ -d usr/lib64 ]] && libdir=lib64

-make -C gcc lang.install-common lang.install-man &&
-install -c gcc/cc1plus ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ &&
-make -C $HOST/libstdc++-v3/ install &&
-
-# specs file stuff
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION &&
-mkdir -p $SPECSDIR/specs-local &&
-cp $SCRIPT_DIRECTORY/specs_g++ $SPECSDIR/specs-local
+for file in usr/bin \
+ usr/lib/gcc \
+ usr/include \
+ usr/$libdir \
+ usr/libexec/gcc \
+ usr/share
+do
+ local dir=$(dirname $file)
+ local dest=$file
+ [[ -e /$dir ]] || mkdir -p /$dir
+ [[ -d /$file ]] && dest=$dir
+ cp -va $file /$dest
+done
diff --git a/gnu/g++/PRE_BUILD b/gnu/g++/PRE_BUILD
index ada199a..02dbf22 100755
--- a/gnu/g++/PRE_BUILD
+++ b/gnu/g++/PRE_BUILD
@@ -6,4 +6,5 @@ fi
default_pre_build &&
cd $BUILD_DIRECTORY &&
unpack_file 2 &&
-mk_source_dir $SOURCE_DIRECTORY.bld
+mk_source_dir $SOURCE_DIRECTORY.bld &&
+mk_source_dir $SOURCE_DIRECTORY.install
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index ad3d9c7..4c1f6b0 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -24,8 +24,24 @@ $SOURCE_DIRECTORY/configure
\
--infodir=${INSTALL_ROOT}/usr/share/info \
--mandir=${INSTALL_ROOT}/usr/share/man \
--enable-threads=posix \
+ --program-suffix=-${VERSION%.*} \
--with-system-zlib \
$GCC_MULTILIB $OPTS &&

make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
- profiledbootstrap
+ profiledbootstrap &&
+make DESTDIR=$SOURCE_DIRECTORY.install install-no-fixedincludes &&
+
+# set up specs file handling
+local SPECSDIR=$SOURCE_DIRECTORY.install/usr/lib/gcc/$HOST/$VERSION
&&
+mkdir -p $SPECSDIR/specs-local &&
+cp gcc/specs $SPECSDIR/specs-local/specs-gcc &&
+if [[ $HOST == x86_64-* && $GCC_NOLIB64 == n ]]
+then
+ # make sure the linker gets compiled in as a /lib64 one
+ sed -i 's#/lib/ld-linux-x86-64.so.2#/lib64/ld-linux-x86-64.so.2#'
$SPECSDIR/specs-local/specs-gcc
+fi &&
+# make sure installwatch tracks it, the cat alone doesn't do that
+touch $SPECSDIR/specs &&
+cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
+
diff --git a/gnu/gcc/FINAL b/gnu/gcc/FINAL
index 907a1a0..41b42d3 100755
--- a/gnu/gcc/FINAL
+++ b/gnu/gcc/FINAL
@@ -1 +1,4 @@
rm_source_dir $SOURCE_DIRECTORY.bld
+rm_source_dir $SOURCE_DIRECTORY.install
+ln -sf gcc-${VERSION%.*} ${TRACK_ROOT}/usr/bin/gcc
+ln -sf gcc ${TRACK_ROOT}/usr/bin/cc
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 42d227d..81f1ad7 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,9 @@
+2007-10-20 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: added install to stage area and program prefix
+ * FINAL: removed stage area
+ * INSTALL: installed gcc from stage area to system
+ * PRE_BUILD: created stage area
+
2007-10-20 David Brown <dmlb2000 AT gmail.com>
* INSTALL: make sure if they are using lib64 to compile in the linker
as if it was in /lib64
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index 7ed5d01..d4bbdb5 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -1,32 +1,20 @@
#
# Bug #10647, also fixed in devel Sorcery
#
-cd $SOURCE_DIRECTORY.bld &&
+cd $SOURCE_DIRECTORY.install &&
+local libdir=lib
+[[ -d usr/lib64 ]] && libdir=lib64

-# in some weird cases, this actually fails with multiple jobs
-make_single &&
-make CFLAGS="$CFLAGS" BOOT_CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
- install-no-fixedincludes &&
-
-if [[ "$HOST" == x86_64-* ]]; then
- [ -d /lib64 -a ! -f /lib/ld-linux-x86-64.so.2 -a -f
/lib64/ld-linux-x86-64.so.2 ] &&
- ln -s $TRACK_ROOT/lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2
- true # see bug 8626 for info about this conditional
-fi &&
-
-# make some extra symlinks
-ln -sf gcc ${INSTALL_ROOT}/usr/bin/cc &&
-ln -sf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib &&
-
-# set up specs file handling
-local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION &&
-mkdir -p $SPECSDIR/specs-local &&
-cp gcc/specs $SPECSDIR/specs-local/specs-gcc &&
-if [[ $HOST == x86_64-* && $GCC_NOLIB64 == n ]]
-then
- # make sure the linker gets compiled in as a /lib64 one
- sed -i 's#/lib/ld-linux-x86-64.so.2#/lib64/ld-linux-x86-64.so.2#'
$SPECSDIR/specs-local/specs-gcc
-fi &&
-# make sure installwatch tracks it, the cat alone doesn't do that
-touch $SPECSDIR/specs &&
-cat $SPECSDIR/specs-local/* > $SPECSDIR/specs
+for file in usr/bin \
+ usr/lib/gcc \
+ usr/include \
+ usr/$libdir \
+ usr/libexec/gcc \
+ usr/share
+do
+ local dir=$(dirname $file)
+ local dest=$file
+ [[ -e /$dir ]] || mkdir -p /$dir
+ [[ -d /$file ]] && dest=$dir
+ cp -va $file /$dest
+done
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 0b6e506..69eac77 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
mk_source_dir $SOURCE_DIRECTORY.bld &&
+mk_source_dir $SOURCE_DIRECTORY.install &&
cd $SOURCE_DIRECTORY &&
# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26539 for the rationale for
# the below



  • [SM-Commit] GIT changes to devel-gcc-parallel grimoire by David Brown (4782d404bd4d44b993944274e932c69033b2b0c2), David Brown, 10/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page