Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b57eb3d02917488bdd9530c19e48b2c64f8fb5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b57eb3d02917488bdd9530c19e48b2c64f8fb5)
  • Date: Sun, 31 Dec 2006 15:29:11 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

libs/glibc/BUILD | 7 ++++++-
libs/glibc/HISTORY | 5 +++++
2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 06b57eb3d02917488bdd9530c19e48b2c64f8fb5
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

glibc: limit lib64 code to x86_64 (preventing unnecessary configure run
that failed for some ppl)

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index 42b0575..75d6370 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -6,9 +6,14 @@ if [ "$GLIBC_NOLIB64" = "y" ]; then
sedit "s/264/2/" sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed
fi &&

+
+# 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...
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
# install x86_64 libraries to lib instead of lib64
sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure &&
-sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure.in &&
+sedit "s/| x86_64//" sysdeps/unix/sysv/linux/configure.in
+fi &&

#
# bug#5570 ccache sometimes has trouble correctly recognising minor
differences
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 5d21b55..d481898 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2006-12-31 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: limit these two lib64 lines to x86_64, they trigger
+ an additional configure run that mysteriously fails with a grep
error
+ for some ppl on various archs
+
2006-11-09 David Brown <dmlb2000 AT gmail.com>
* PRE_BUILD: added patch from upstream bug
https://bugzilla.samba.org/show_bug.cgi?id=3678



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (06b57eb3d02917488bdd9530c19e48b2c64f8fb5), Thomas Orgis, 12/31/2006

Archive powered by MHonArc 2.6.24.

Top of Page