Skip to Content.
Sympa Menu

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

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 (92ef7c4e42cbe46e85b489832aadb3613dec13a9)
  • Date: Sat, 20 Oct 2007 14:24:10 -0500

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

gnu/gcc33/BUILD | 10 ++++++----
gnu/gcc33/FINAL | 1 +
gnu/gcc33/HISTORY | 7 +++++++
gnu/gcc33/INSTALL | 36 ++++++++++++++++++------------------
gnu/gcc33/PRE_BUILD | 3 ++-
gnu/gcc34/BUILD | 10 ++++++----
gnu/gcc34/FINAL | 3 ++-
gnu/gcc34/HISTORY | 7 +++++++
gnu/gcc34/INSTALL | 21 ++++++++++++++++++---
gnu/gcc34/PRE_BUILD | 3 ++-
10 files changed, 69 insertions(+), 32 deletions(-)

New commits:
commit 92ef7c4e42cbe46e85b489832aadb3613dec13a9
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

gcc33 added install to /usr in parallel with other gcc's

commit 6e4ebb9088f399bc7bf5f158b196de20c2f2de7f
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

gcc34 added install to /usr in parallel with other gcc's

diff --git a/gnu/gcc33/BUILD b/gnu/gcc33/BUILD
index 7b3d55b..d7a5e1a 100755
--- a/gnu/gcc33/BUILD
+++ b/gnu/gcc33/BUILD
@@ -11,9 +11,10 @@ CXXFLAGS=${CFLAGS/pentium-m/pentium3} &&
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
- --prefix=${INSTALL_ROOT}/opt/gcc33 \
- --infodir=${INSTALL_ROOT}/opt/gcc33/share/info \
- --mandir=${INSTALL_ROOT}/opt/gcc33/share/man \
+ --prefix=${INSTALL_ROOT}/usr \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --program-suffix=-${VERSION%.*} \
--enable-threads=posix \
--enable-languages=c,c++ \
$GCC_MULTILIB $OPTS &&
@@ -25,4 +26,5 @@ sedit
's|\(CFLAGS_FOR_TARGET.*\)\$(CFLAGS)|\1$(CFLAGS:k8=athlon-xp)|g' Makefile
sedit 's|\(CXXFLAGS_FOR_TARGET.*\)\$(CXXFLAGS)|\1$(CXXFLAGS:k8=athlon-xp)|g'
Makefile &&
sedit 's|march=k8|march=athlon-xp|g' libiberty/Makefile
libiberty/testsuite/Makefile &&

-make bootstrap
+make bootstrap &&
+make DESTDIR=$SOURCE_DIRECTORY.install install-no-fixedincludes
diff --git a/gnu/gcc33/FINAL b/gnu/gcc33/FINAL
index 907a1a0..6eceb63 100755
--- a/gnu/gcc33/FINAL
+++ b/gnu/gcc33/FINAL
@@ -1 +1,2 @@
rm_source_dir $SOURCE_DIRECTORY.bld
+rm_source_dir $SOURCE_DIRECTORY.install
diff --git a/gnu/gcc33/HISTORY b/gnu/gcc33/HISTORY
index cd55811..087c302 100644
--- a/gnu/gcc33/HISTORY
+++ b/gnu/gcc33/HISTORY
@@ -1,3 +1,10 @@
+2007-10-20 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: added program prefix and installed everything to /usr called
+ make install to a stage directory
+ * FINAL: added removal of stage directory
+ * INSTALL: rip out old install and install manually using cp
+ * PRE_BUILD: added creation of stage directory
+
2007-01-22 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: ensure that compilers get cast after archspecs so that
they all use the same fresh setup
diff --git a/gnu/gcc33/INSTALL b/gnu/gcc33/INSTALL
index 92260c4..4026923 100755
--- a/gnu/gcc33/INSTALL
+++ b/gnu/gcc33/INSTALL
@@ -1,22 +1,22 @@
#
# Bug #10647, also fixed in devel Sorcery
#
-cd $SOURCE_DIRECTORY.bld &&
+cd $SOURCE_DIRECTORY.install &&
+local libdir=lib
+[[ -d usr/lib64 ]] && libdir=lib64

-# create a symlink to version 5 runtime in regular prefix $INSTALL_ROOT/usr
-## @param runtime library name relative to prefix
-function link_runtime ()
-{
- local TARGET_LINK="$INSTALL_ROOT/opt/gcc33/$1" &&
- if [[ -f "$TARGET_LINK" ]]; then
- local TARGET=$(readlink -f "$TARGET_LINK") &&
- message "${MESSAGE_COLOR}Linking $1 to $TARGET...${DEFAULT_COLOR}" &&
- [[ -f "$TARGET" ]] &&
- ln -fns "${TARGET##$INSTALL_ROOT}" "$INSTALL_ROOT/usr/$1"
- fi
-}
-
-make prefix=${INSTALL_ROOT}/opt/gcc33 install-no-fixedincludes &&
-
-link_runtime lib/libstdc++.so.5 &&
-link_runtime lib64/libstdc++.so.5
+for file in usr/bin \
+ usr/lib/gcc-lib \
+ usr/include \
+ usr/libexec/gcc \
+ usr/$libdir/libstdc++.so.5 \
+ usr/$libdir/libstdc++.so.5.0.7 \
+ usr/share/info \
+ usr/share/man
+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/gcc33/PRE_BUILD b/gnu/gcc33/PRE_BUILD
index 1a861c9..92943c7 100755
--- a/gnu/gcc33/PRE_BUILD
+++ b/gnu/gcc33/PRE_BUILD
@@ -1,2 +1,3 @@
default_pre_build &&
-mk_source_dir $SOURCE_DIRECTORY.bld
+mk_source_dir $SOURCE_DIRECTORY.bld &&
+mk_source_dir $SOURCE_DIRECTORY.install
diff --git a/gnu/gcc34/BUILD b/gnu/gcc34/BUILD
index a92817e..8720a86 100755
--- a/gnu/gcc34/BUILD
+++ b/gnu/gcc34/BUILD
@@ -1,11 +1,13 @@
cd $SOURCE_DIRECTORY.bld &&
$SOURCE_DIRECTORY/configure \
--host=$HOST \
- --prefix=${INSTALL_ROOT}/opt/gcc34 \
- --infodir=${INSTALL_ROOT}/opt/gcc34/share/info \
- --mandir=${INSTALL_ROOT}/opt/gcc34/share/man \
+ --prefix=${INSTALL_ROOT}/usr \
+ --infodir=${INSTALL_ROOT}/usr/share/info \
+ --mandir=${INSTALL_ROOT}/usr/share/man \
+ --program-suffix=-${VERSION%.*} \
--enable-threads=posix \
--enable-languages=c,c++ \
$GCC_MULTILIB $OPTS &&

-make bootstrap
+make bootstrap &&
+make DESTDIR=$SOURCE_DIRECTORY.install install-no-fixedincludes
diff --git a/gnu/gcc34/FINAL b/gnu/gcc34/FINAL
index 907a1a0..245ab6b 100755
--- a/gnu/gcc34/FINAL
+++ b/gnu/gcc34/FINAL
@@ -1 +1,2 @@
-rm_source_dir $SOURCE_DIRECTORY.bld
+rm_source_dir $SOURCE_DIRECTORY.bld &&
+rm_source_dir $SOURCE_DIRECTORY.install
diff --git a/gnu/gcc34/HISTORY b/gnu/gcc34/HISTORY
index da452c2..516ae9d 100644
--- a/gnu/gcc34/HISTORY
+++ b/gnu/gcc34/HISTORY
@@ -1,3 +1,10 @@
+2007-10-20 David Brown <dmlb2000 AT gmail.com>
+ * BUILD: added program prefix and changed install directory to /usr
+ and installed to stage directory
+ * FINAL: added stage directory for removal
+ * INSTALL: rip out everything and install manually using cp
+ * PRE_BUILD: added creation of stage directory
+
2007-01-22 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: ensure that compilers get cast after archspecs so that
they all use the same fresh setup
diff --git a/gnu/gcc34/INSTALL b/gnu/gcc34/INSTALL
index be14c3d..fbfb78a 100755
--- a/gnu/gcc34/INSTALL
+++ b/gnu/gcc34/INSTALL
@@ -1,6 +1,21 @@
#
-# 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 prefix=${INSTALL_ROOT}/opt/gcc34 install-no-fixedincludes
+for file in usr/bin \
+ usr/lib/gcc \
+ usr/include \
+ usr/$libdir/libstdc++.so.6.0.3 \
+ usr/libexec/gcc \
+ usr/share/info \
+ usr/share/man
+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/gcc34/PRE_BUILD b/gnu/gcc34/PRE_BUILD
index 38f5c93..606cecc 100755
--- a/gnu/gcc34/PRE_BUILD
+++ b/gnu/gcc34/PRE_BUILD
@@ -1,4 +1,5 @@
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



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

Archive powered by MHonArc 2.6.24.

Top of Page