r1253 - in trunk: . scripts/scripts/cross-scripts scripts/scripts/funcs scripts/scripts/native-scripts

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Fri Mar 10 02:09:43 PST 2006


Author: ryan
Date: 2006-03-10 03:09:42 -0700 (Fri, 10 Mar 2006)
New Revision: 1253

Modified:
   trunk/
   trunk/scripts/scripts/cross-scripts/cross-glibc-full.sh
   trunk/scripts/scripts/funcs/glibc-funcs.sh
   trunk/scripts/scripts/native-scripts/native-glibc.sh
Log:
 r1303 at rei:  lfs | 2006-03-10 20:58:18 +1100
 Update for glibc-2.4



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1302
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1303
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Modified: trunk/scripts/scripts/cross-scripts/cross-glibc-full.sh
===================================================================
--- trunk/scripts/scripts/cross-scripts/cross-glibc-full.sh	2006-03-10 10:09:22 UTC (rev 1252)
+++ trunk/scripts/scripts/cross-scripts/cross-glibc-full.sh	2006-03-10 10:09:42 UTC (rev 1253)
@@ -63,12 +63,18 @@
 
 # if we don't have linuxthreads dirs (ie: a glibc release), then
 # unpack the linuxthreads tarball
-if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
-   OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
-   PKGDIR=${OLDPKGDIR}
-fi
+case ${GLIBC_VER} in
+   2.4 | 2.4.* ) ;;
+   * )
+      if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
+         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
+         PKGDIR=${OLDPKGDIR}
+      fi
+   ;;
+esac
 
 # unpack libidn add-on if required (should be supplied with cvs versions)
+if [ "${USE_LIBIDN}" = "Y" ]; then
 case ${target_glibc_ver} in
    2.3.[4-9]* | 2.4* )
       cd ${SRC}/${PKGDIR}
@@ -78,6 +84,7 @@
       fi
    ;;
 esac
+fi
 
 # apply glibc patches as required depending on the above gcc/kernel versions
 # see funcs/glibc_funcs.sh

Modified: trunk/scripts/scripts/funcs/glibc-funcs.sh
===================================================================
--- trunk/scripts/scripts/funcs/glibc-funcs.sh	2006-03-10 10:09:22 UTC (rev 1252)
+++ trunk/scripts/scripts/funcs/glibc-funcs.sh	2006-03-10 10:09:42 UTC (rev 1253)
@@ -24,7 +24,7 @@
       4.* )
          echo " o compiling with gcc 4.x"
          case ${target_glibc_ver} in
-            2.3.[7-9]* | 2.4.* ) ;;
+            2.3.[7-9]* | 2.4 | 2.4.* ) ;;
             2.3.6 )
                apply_patch glibc-20051024-localedef_segfault-1
 

Modified: trunk/scripts/scripts/native-scripts/native-glibc.sh
===================================================================
--- trunk/scripts/scripts/native-scripts/native-glibc.sh	2006-03-10 10:09:22 UTC (rev 1252)
+++ trunk/scripts/scripts/native-scripts/native-glibc.sh	2006-03-10 10:09:42 UTC (rev 1253)
@@ -60,12 +60,18 @@
 
 # if we don't have linuxthreads dirs (ie: a glibc release), then
 # unpack the linuxthreads tarball
-if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
-   OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
-   PKGDIR=${OLDPKGDIR}
-fi
+case ${GLIBC_VER} in
+   2.4 | 2.4.* ) ;;
+   * )
+      if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
+         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
+         PKGDIR=${OLDPKGDIR}
+      fi
+   ;;
+esac
 
 # unpack libidn add-on if required (should be supplied with cvs versions)
+if [ "${USE_LIBIDN}" = "Y" ]; then
 case ${target_glibc_ver} in
    2.3.[4-9]* | 2.4* )
       cd ${SRC}/${PKGDIR}
@@ -75,11 +81,20 @@
       fi
    ;;
 esac
+fi
 
 # apply glibc patches as required depending on the above gcc/kernel versions
 # see funcs/glibc_funcs.sh
 apply_glibc_patches
 
+# Ensure sanity check uses correct glibc
+cd ${SRC}/${PKGDIR}
+ld_so=`gcc ${ARCH_CFLAGS} -dumpspecs | grep dynamic-linker | \
+   sed -e "s at .*-dynamic-linker \([-._a-zA-Z0-9/]*/${libdirname}/[-._a-zA-Z0-9/]*\).*@\1 at g" \
+       -e 's@^.*/\(.*\)@\1 at g'`
+sed -i "s at link_libs -o at link_libs -L/usr/${libdirname} -Wl,-dynamic-linker=/${libdirname}/${ld_so} -o@" \
+   scripts/test-installation.pl
+
 # configuration for pthread type
 #-------------------------------
 # HACK: nptl for sparc64 wont build




More information about the cross-lfs mailing list