Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merged-gcc grimoire by Andraž Levstik (956986be63636ca854659360c17eba0033c14bca)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merged-gcc grimoire by Andraž Levstik (956986be63636ca854659360c17eba0033c14bca)
  • Date: Sat, 25 Jul 2009 07:38:33 -0500

GIT changes to devel-merged-gcc grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

gnu/gcc/BUILD | 6 ++----
gnu/gcc/HISTORY | 5 +++++
gnu/gcc/INSTALL | 15 +--------------
gnu/gcc/PREPARE | 4 ----
libs/glibc/BUILD | 9 +++------
libs/glibc/HISTORY | 6 +++++-
libs/glibc/PREPARE | 5 -----
7 files changed, 16 insertions(+), 34 deletions(-)

New commits:
commit 956986be63636ca854659360c17eba0033c14bca
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

glibc: dreppod the no lib64 query it's always lib now

commit 6ead7e6e993e7070d74c480c36d158b3a9587c93
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

gcc: removed the /lib workaround and specs handling

diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD
index 0ece038..d4e2401 100755
--- a/gnu/gcc/BUILD
+++ b/gnu/gcc/BUILD
@@ -1,9 +1,7 @@
# install gcc libraries to /lib instead of /lib64
sedit "s/lib64/lib/" gcc/config/i386/linux64.h &&
-if [[ "$GCC_NOLIB64" == 'y' ]]; then
- # tell gcc to target binaries to expect the linker in /lib instead of
/lib64
- sedit "s/lib64/lib/" gcc/config/i386/t-linux64
-fi &&
+# tell gcc to target binaries to expect the linker in /lib instead of /lib64
+sedit "s/lib64/lib/" gcc/config/i386/t-linux64

if [[ "$ARCHITECTURE" == "pentium4" ||
"$ARCHITECTURE" == "pentium-m" ]]; then
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 6dbec56..f8c4771 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * BUILD: removed the if about /lib64
+ * PREPARE: no more /lib workaround it's always in /lib
+ * INSTALL: no more specs handling and /lib
+
2009-07-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* BUILD: reformatted and added support for x86
* PRE_BUILD: reformatted
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index 78abda8..1911d2b 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -15,17 +15,4 @@ 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 &&
-
-# 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
+fi
diff --git a/gnu/gcc/PREPARE b/gnu/gcc/PREPARE
index 5461dfc..a8c6eec 100755
--- a/gnu/gcc/PREPARE
+++ b/gnu/gcc/PREPARE
@@ -1,7 +1,3 @@
- if [[ "$HOST" == x86_64-* ]]; then
- config_query GCC_NOLIB64 "Shall gcc compile binaries to expect the
dynamic linker in /lib (not /lib64) (lib64 purge part 1 of 2)?" n
- fi
-
message "The following special targets are available for compiler selection:"
message "default - will build c and c++"
message "all - will build all compilers"
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index e041599..ebaddb2 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,11 +1,8 @@
make_single &&

-if [ "$GLIBC_NOLIB64" = "y" ]; then
- # install x86_64 linker to lib instead of lib64
- sedit "s/lib64/lib/" sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
- sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
-fi &&
-
+# install x86_64 linker to lib instead of lib64
+sedit "s/lib64/lib/" sysdeps/unix/sysv/linux/x86_64/ldconfig.h &&
+sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed &&

# this causes configure to be run again where it fails for some people on
PIII and for me on Alpha
# the error is about no working grep found...
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 4f3b2a8..2f76c6f 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,7 @@
+2009-07-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * BUILD: removed the /lib workaround it's always in /lib
+ * PREPARE: removed the query it's always in /lib
+
2009-06-09 Eric Sandall <sandalle AT sourcemage.org>
* init.d/nscd: Also requires /var/db/nscd to exist

@@ -40,7 +44,7 @@
* PRE_BUILD: don't apply gcc43.patch, fnstsw.patch
* gcc43.patch, fnstsw.patch: deleted, now included upstream

-2008-11-22 Fredrik Carlstr�m <fredrik.carlstrom AT tele2.se>
+2008-11-22 Fredrik Carlstr?m <fredrik.carlstrom AT tele2.se>
* DETAILS: update cvs version to latest stable (2.9)
optionally use sanitized kernel headers
fixes bug #14897
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index c9bbbe9..59e40fd 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -13,9 +13,4 @@ if [[ $(uname -r) = 2.6.* ]]; then
config_query GLIBC_USEIDN "Would you like to compile glibc with libidn
support?" y &&
config_query GLIBC_SANITIZE_HEADERS "Do you want to use sanitized linux
kernel headers from the latest stable release" n
fi
-fi &&
-
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
- config_query GLIBC_NOLIB64 "Shall the dynamic linker install to /lib (not
/lib64) (lib64 purge part 2 of 2)?" n
fi
-



  • [SM-Commit] GIT changes to devel-merged-gcc grimoire by Andraž Levstik (956986be63636ca854659360c17eba0033c14bca), Andraž Levstik, 07/25/2009

Archive powered by MHonArc 2.6.24.

Top of Page