Changeset f6180d2 for scripts

Timestamp:

Mar 10, 2006, 3:03:56 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

0019206

Parents:

a8a1084

Message:

r2514@server (orig r1253): ryan | 2006-03-10 02:09:42 -0800

r1303@rei: lfs | 2006-03-10 20:58:18 +1100
Update for glibc-2.4

Location:

scripts/scripts

Files:

• cross-scripts/cross-glibc-full.sh (modified) (2 diffs)
• funcs/glibc-funcs.sh (modified) (1 diff)
• native-scripts/native-glibc.sh (modified) (2 diffs)

scripts/scripts/cross-scripts/cross-glibc-full.sh

@@ -64 +64 @@
 # 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* )
@@ -79 +85 @@
    ;;
 esac
+fi
 
 # apply glibc patches as required depending on the above gcc/kernel versions

scripts/scripts/funcs/glibc-funcs.sh

@@ -25 +25 @@
          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

scripts/scripts/native-scripts/native-glibc.sh

@@ -61 +61 @@
 # 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* )
@@ -76 +82 @@
    ;;
 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@.*-dynamic-linker \([-._a-zA-Z0-9/]*/${libdirname}/[-._a-zA-Z0-9/]*\).*@\1@g" \
+       -e 's@^.*/\(.*\)@\1@g'`
+sed -i "s@link_libs -o@link_libs -L/usr/${libdirname} -Wl,-dynamic-linker=/${libdirname}/${ld_so} -o@" \
+   scripts/test-installation.pl
 
 # configuration for pthread type