Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel grimoire by Arwed von Merkatz (f088e2f8e1a4ecfb4ca14e60a6f588910d6f9223)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel grimoire by Arwed von Merkatz (f088e2f8e1a4ecfb4ca14e60a6f588910d6f9223)
  • Date: Sun, 16 Sep 2007 09:47:10 -0500

GIT changes to devel grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

libs/glibc/HISTORY | 7 +++++++
libs/glibc/PREPARE | 3 +--
libs/glibc/PRE_BUILD | 17 +++++++++++------
3 files changed, 19 insertions(+), 8 deletions(-)

New commits:
commit f088e2f8e1a4ecfb4ca14e60a6f588910d6f9223
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

glibc: fix the issue of GLIBC_ARCH being unset in PRE_BUILD

diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 8ee3525..045a72d 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,10 @@
+2007-09-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PREPARE: removed the persistent_add GLIBC_ARCH, there seems to be
+ problem with persistent vars set in DETAILS
+ * PRE_BUILD: derive GLIBC_HEADERS_DIR from SOURCE3 instead of using
+ GLIBC_ARCH, set GLIBC_HEADERS_DIR to something sane for non-nptl
+ builds
+
2007-09-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* TESTS: added my info
* DETAILS: don't return negative values
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index ed07e7c..aba6486 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -10,5 +10,4 @@ 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 &&
-persistent_add GLIBC_ARCH
+fi
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 4a76e9c..e0baacf 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,12 +1,6 @@
default_pre_build &&

#
-# Set GLIBC_HEADERS_DIR for use later
-#
-persistent_add GLIBC_HEADERS_DIR &&
-GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linux-headers-${HEADERS_VERSION}-${GLIBC_ARCH}
&&
-
-#
# Set GLIBC_LIBIDN_DIR for use later
#
persistent_add GLIBC_LIBIDN_DIR &&
@@ -26,6 +20,12 @@ if [ "$GLIBC_NPTL" = "y" ]; then
#
# Unpack glibc-kernel-headers
#
+ #
+ # Set GLIBC_HEADERS_DIR for use later
+ #
+ persistent_add GLIBC_HEADERS_DIR &&
+ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2} &&
+
unpack_file 3 &&
cd $GLIBC_HEADERS_DIR/usr/include &&
chmod -R +r * &&
@@ -39,6 +39,11 @@ else
#
# Unpack glibc-kernel-headers
#
+ #
+ # Set GLIBC_HEADERS_DIR for use later
+ #
+ persistent_add GLIBC_HEADERS_DIR &&
+ GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/kernel-headers &&
mkdir -p $GLIBC_HEADERS_DIR/usr/include &&
cd $GLIBC_HEADERS_DIR/usr/include &&
unpack_file 5



  • [SM-Commit] GIT changes to devel grimoire by Arwed von Merkatz (f088e2f8e1a4ecfb4ca14e60a6f588910d6f9223), Arwed von Merkatz, 09/16/2007

Archive powered by MHonArc 2.6.24.

Top of Page