Changeset 11fbfa9 for scripts


Ignore:
Timestamp:
Feb 21, 2006, 2:07:27 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:
bc4ea88
Parents:
ec749f6
Message:

r1045@server (orig r1043): ryan | 2006-01-12 00:56:45 -0800

r1079@rei: lfs | 2006-01-12 19:13:09 +1100
Update for glibc-2.3.6
Also add option to skip libgcc_s.so.1 creation (to match cross-lfs book)


Location:
scripts
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • scripts/scripts/build-cross.sh

    rec749f6 r11fbfa9  
    9090}
    9191
    92 test "Y" = "${MULTIARCH}" &&
    93 {
    94    script_list="${script_list}
     92script_list="${script_list}
    9593cross-binutils.sh
    9694cross-glibc-hdrs.sh
    97 cross-gcc-static.sh
     95cross-gcc-static.sh"
     96
     97if [ ! "Y" = "${NO_GCC_EH}" ]; then
     98   if [ "Y" = "${MULTIARCH}" ]; then
     99      script_list="${script_list}
    98100cross-glibc-crtobjs-32.sh
    99101cross-glibc-crtobjs-64.sh
    100102cross-gcc-shared.sh"
     103   else
     104      script_list="${script_list}
     105cross-glibc-crtobjs.sh
     106cross-gcc-shared.sh"
     107   fi
     108fi
    101109
    102    test "N" = "${DEFAULT_64}" &&
    103    {
     110
     111if [ "Y" = "${MULTIARCH}" ]; then
     112   if [ "N" = "${DEFAULT_64}" ]; then
    104113      script_list="${script_list}
    105114cross-glibc-full-64.sh
    106115cross-glibc-full-32.sh
    107116cross-gcc-final.sh"
    108    } || {
     117   else
    109118      script_list="${script_list}
    110119cross-glibc-full-32.sh
    111120cross-glibc-full-64.sh
    112121cross-gcc-final.sh"
    113    }
    114 
    115 } || {
     122   fi
     123else
    116124   script_list="${script_list}
    117 cross-binutils.sh
    118 cross-glibc-hdrs.sh
    119 cross-gcc-static.sh
    120 cross-glibc-crtobjs.sh
    121 cross-gcc-shared.sh
    122125cross-glibc-full.sh
    123126cross-gcc-final.sh"
    124 }
     127fi
    125128
    126129SCRIPTLIST=`echo "${script_list}" | \
  • scripts/scripts/cross-scripts/cross-glibc-full.sh

    rec749f6 r11fbfa9  
    8484apply_glibc_patches
    8585
     86
    8687# HACK: nptl for sparc64 wont build
    8788case ${TGT_ARCH} in
     
    9091   ;;
    9192esac
     93
     94if [ "Y" = "${NO_GCC_EH}" ]; then
     95   cd ${SRC}/${PKGDIR}
     96   if [ ! -f Makeconfig-ORIG ]; then cp -p Makeconfig Makeconfig-ORIG ; fi
     97   sed 's/-lgcc_eh//g' Makeconfig-ORIG > Makeconfig
     98fi
    9299
    93100if [ "Y" = "${USE_NPTL}" ]; then
  • scripts/scripts/funcs/glibc-funcs.sh

    rec749f6 r11fbfa9  
    2525         echo " o compiling with gcc 4.x"
    2626         case ${target_glibc_ver} in
    27             2.3.[6-9]* | 2.4.* ) ;;
     27            2.3.[7-9]* | 2.4.* ) ;;
     28            2.3.6 )
     29               apply_patch glibc-20051024-localedef_segfault-1
     30
     31               case ${TGT_ARCH} in
     32               sparc* )
     33                  # fix CFLAGS-rtld to remove deprecated sparc compiler options
     34                  # from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
     35                  # ( -mv8 is no longer supported ). Use -mcpu -mtune options
     36                  # from TGT_CFLAGS (which get passed regardless)
     37                  echo "   - removing deprecated gcc options from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
     38                  file="sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
     39                  if [ ! -f ${file}-ORIG ]; then cp -p ${file} ${file}-ORIG ; fi
     40                  grep -v \\-mv8 ${file}-ORIG > ${file}
     41               ;;
     42               esac
     43
     44            ;;
    2845            2.3.5 )
    2946               # gcc4 support is working in CVS glibc
     47
    3048               if [ ! -d ${SRC}/${PKGDIR}/CVS ]; then
    3149                  echo "   - applying gcc4 fixes"
     
    3856                  apply_patch glibc-2.3.5-allow-gcc4-wcstol_l
    3957               fi
     58
    4059               case ${TGT_ARCH} in
    4160               sparc* )
     
    118137            ${fname}-ORIG > ${fname}
    119138         }
     139
    120140         case ${TGT_ARCH} in
    121141            m68k* )
     
    125145            arm* ) apply_patch glibc-arm-ctl_bus_isa ;;
    126146         esac
     147
    127148      ;;
    128149      2.4.2[4-9] | 2.4.3* )
Note: See TracChangeset for help on using the changeset viewer.