From cc791d8e562cbd0f5c2a673fe74659b7a5864a07 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Mon, 5 Jul 2010 03:59:09 +0000
Subject: [PATCH] -Fixed bug in EGLIBC version numbering (created problem with
 temporary symlink when installing eglibc at stage2 for x86_64) -Fixed bug
 with x86_64 CFLAGS in eglibc

---
 NOTES             |  3 +++
 packages-list     |  4 ++--
 stage0/cis-eglibc |  6 +++++-
 stage2/cis-eglibc | 26 ++++++++++++++++++++------
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/NOTES b/NOTES
index 91626cc..dcdec56 100644
--- a/NOTES
+++ b/NOTES
@@ -38,3 +38,6 @@ Reduces-size hvlinux
 Après le stage 1:
   1. Monter /mnt/hvrepos (ajouter à /etc/fstab)
   2. Copier les sources de hvlinux
+  3. Avant de lancer le stage2, modifier la variable LFS="" dans 
+sysinfos
+
diff --git a/packages-list b/packages-list
index cc0f91e..aac8e60 100644
--- a/packages-list
+++ b/packages-list
@@ -69,8 +69,8 @@ E2FSPROGS="e2fsprogs-1.41.9"
 EASYTAG="easytag-2.1"
 ED="ed-1.4"
 EGGDBUS="eggdbus-0.6"
-EGLIBC="eglibc-2.10.1-20100305-r9381"
-EGLIBC_PORTS="eglibc-ports-2.10.1-20100305-r9381"
+EGLIBC="eglibc-2.10.2-20100305-r9381"
+EGLIBC_PORTS="eglibc-ports-2.10.2-20100305-r9381"
 UCLIBC="uClibc-0.9.30.1"
 EMACS="emacs-23.1"
 ESOUND="esound-0.2.37"
diff --git a/stage0/cis-eglibc b/stage0/cis-eglibc
index 7f3dadf..6172ee0 100755
--- a/stage0/cis-eglibc
+++ b/stage0/cis-eglibc
@@ -7,10 +7,14 @@ source ../functions
 source ../packages-list
 
 case "${HVL_TARGET}" in
-    "x86")
+    "x86" | "x86_64")
         # Manually apply patch
         apply_patch ${1}-rpath.patch ${1}
+        ;;
+esac
 
+case "${HVL_TARGET}" in
+    "x86")
         TMP_CFLAGS="-march=$(cut -d- -f1 <<< ${CLFS_TARGET}) -mtune=generic -g -O2"
         ;;
 esac
diff --git a/stage2/cis-eglibc b/stage2/cis-eglibc
index 314f30c..f707f70 100755
--- a/stage2/cis-eglibc
+++ b/stage2/cis-eglibc
@@ -13,8 +13,22 @@ PACKAGE=${1}
 shift
 CONFIGURE_OPTS=${*}
 
-# Applying patches (if any)
-apply_patches ${PACKAGE}
+EGLIBC_VER=$(echo ${PACKAGE} | sed "s!eglibc-\([0-9]*\.[0-9]*\.[0-9]*\)-.*!\1!g")
+
+case "${HVL_TARGET}" in
+    "x86" | "x86_64")
+        # Manually apply patch
+        apply_patch ${1}-rpath.patch ${1}
+        ;;
+esac
+
+TMP_CFLAGS="-mtune=generic -g -O2"
+
+case "${HVL_TARGET}" in
+    "x86")
+        TMP_CFLAGS="-march=$(cut -d- -f1 <<< ${CLFS_TARGET}) ${TMP_CFLAGS}"
+        ;;
+esac
 
 # When running make install, a script called test-installation.pl
 # performs a small sanity test on our newly installed Glibc. However,
@@ -40,12 +54,12 @@ esac
 # Configure options:
 # --libexecdir=/usr/lib/eglibc
 #     Changes the location of the pt_chown program from its default of /usr/libexec to /usr/lib/eglibc.
-CFLAGS="-march=$(cut -d- -f1 <<< $MACHTYPE) -mtune=generic -g -O2" \
-    ../${PACKAGE}/configure \
+CFLAGS=${TMP_CFLAGS} \
+     ../${PACKAGE}/configure \
     --prefix=/usr \
     --disable-profile \
     --enable-add-ons \
-    --enable-kernel=2.6.32 \
+    --enable-kernel=$(get_pkg_ver ${KERNEL}) \
     --libexecdir=/usr/lib/eglibc \
     ${CONFIGURE_OPTS}
 make
@@ -59,7 +73,7 @@ case "${HVL_TARGET}" in
         # 32-bit loader which has a different name from the 64-bit loader
         # (unlike on other 64-bit architectures). We fool it by creating a
         # symlink to the real loader.
-        ln -svfT ld-$(get_pkg_ver ${PACKAGE}).so /lib/ld-linux.so.2
+        ln -svfT ld-${EGLIBC_VER}.so /lib/ld-linux.so.2
         make install
 
         # Now we can remove this symlink.
-- 
2.20.1