Changeset f6180d2 for scripts


Ignore:
Timestamp:
Mar 10, 2006, 3:03:56 AM (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • scripts/scripts/cross-scripts/cross-glibc-full.sh

    ra8a1084 rf6180d2  
    6464# if we don't have linuxthreads dirs (ie: a glibc release), then
    6565# unpack the linuxthreads tarball
    66 if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
    67    OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
    68    PKGDIR=${OLDPKGDIR}
    69 fi
     66case ${GLIBC_VER} in
     67   2.4 | 2.4.* ) ;;
     68   * )
     69      if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
     70         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
     71         PKGDIR=${OLDPKGDIR}
     72      fi
     73   ;;
     74esac
    7075
    7176# unpack libidn add-on if required (should be supplied with cvs versions)
     77if [ "${USE_LIBIDN}" = "Y" ]; then
    7278case ${target_glibc_ver} in
    7379   2.3.[4-9]* | 2.4* )
     
    7985   ;;
    8086esac
     87fi
    8188
    8289# apply glibc patches as required depending on the above gcc/kernel versions
  • scripts/scripts/funcs/glibc-funcs.sh

    ra8a1084 rf6180d2  
    2525         echo " o compiling with gcc 4.x"
    2626         case ${target_glibc_ver} in
    27             2.3.[7-9]* | 2.4.* ) ;;
     27            2.3.[7-9]* | 2.4 | 2.4.* ) ;;
    2828            2.3.6 )
    2929               apply_patch glibc-20051024-localedef_segfault-1
  • scripts/scripts/native-scripts/native-glibc.sh

    ra8a1084 rf6180d2  
    6161# if we don't have linuxthreads dirs (ie: a glibc release), then
    6262# unpack the linuxthreads tarball
    63 if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
    64    OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
    65    PKGDIR=${OLDPKGDIR}
    66 fi
     63case ${GLIBC_VER} in
     64   2.4 | 2.4.* ) ;;
     65   * )
     66      if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
     67         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
     68         PKGDIR=${OLDPKGDIR}
     69      fi
     70   ;;
     71esac
    6772
    6873# unpack libidn add-on if required (should be supplied with cvs versions)
     74if [ "${USE_LIBIDN}" = "Y" ]; then
    6975case ${target_glibc_ver} in
    7076   2.3.[4-9]* | 2.4* )
     
    7682   ;;
    7783esac
     84fi
    7885
    7986# apply glibc patches as required depending on the above gcc/kernel versions
    8087# see funcs/glibc_funcs.sh
    8188apply_glibc_patches
     89
     90# Ensure sanity check uses correct glibc
     91cd ${SRC}/${PKGDIR}
     92ld_so=`gcc ${ARCH_CFLAGS} -dumpspecs | grep dynamic-linker | \
     93   sed -e "s@.*-dynamic-linker \([-._a-zA-Z0-9/]*/${libdirname}/[-._a-zA-Z0-9/]*\).*@\1@g" \
     94       -e 's@^.*/\(.*\)@\1@g'`
     95sed -i "s@link_libs -o@link_libs -L/usr/${libdirname} -Wl,-dynamic-linker=/${libdirname}/${ld_so} -o@" \
     96   scripts/test-installation.pl
    8297
    8398# configuration for pthread type
Note: See TracChangeset for help on using the changeset viewer.