Changeset 11fbfa9

Timestamp:

Feb 21, 2006, 2:07:27 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:

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:

• patches/glibc-20051024-localedef_segfault-1.patch (added)
• scripts/build-cross.sh (modified) (1 diff)
• scripts/cross-scripts/cross-glibc-full.sh (modified) (2 diffs)
• scripts/funcs/glibc-funcs.sh (modified) (4 diffs)

scripts/scripts/build-cross.sh

@@ -90 +90 @@
 }
 
-test "Y" = "${MULTIARCH}" &&
-{
-   script_list="${script_list}
+script_list="${script_list}
 cross-binutils.sh
 cross-glibc-hdrs.sh
-cross-gcc-static.sh
+cross-gcc-static.sh"
+
+if [ ! "Y" = "${NO_GCC_EH}" ]; then
+   if [ "Y" = "${MULTIARCH}" ]; then
+      script_list="${script_list}
 cross-glibc-crtobjs-32.sh
 cross-glibc-crtobjs-64.sh
 cross-gcc-shared.sh"
+   else
+      script_list="${script_list}
+cross-glibc-crtobjs.sh
+cross-gcc-shared.sh"
+   fi
+fi
 
-   test "N" = "${DEFAULT_64}" &&
-   {
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   if [ "N" = "${DEFAULT_64}" ]; then 
       script_list="${script_list}
 cross-glibc-full-64.sh
 cross-glibc-full-32.sh
 cross-gcc-final.sh"
-   } || {
+   else
       script_list="${script_list}
 cross-glibc-full-32.sh
 cross-glibc-full-64.sh
 cross-gcc-final.sh"
-   }
-
-} || {
+   fi
+else
    script_list="${script_list}
-cross-binutils.sh
-cross-glibc-hdrs.sh
-cross-gcc-static.sh
-cross-glibc-crtobjs.sh
-cross-gcc-shared.sh
 cross-glibc-full.sh
 cross-gcc-final.sh"
-}
+fi
 
 SCRIPTLIST=`echo "${script_list}" | \

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

@@ -84 +84 @@
 apply_glibc_patches
 
+
 # HACK: nptl for sparc64 wont build
 case ${TGT_ARCH} in
@@ -90 +91 @@
    ;;
 esac
+
+if [ "Y" = "${NO_GCC_EH}" ]; then
+   cd ${SRC}/${PKGDIR}
+   if [ ! -f Makeconfig-ORIG ]; then cp -p Makeconfig Makeconfig-ORIG ; fi
+   sed 's/-lgcc_eh//g' Makeconfig-ORIG > Makeconfig
+fi
 
 if [ "Y" = "${USE_NPTL}" ]; then

scripts/scripts/funcs/glibc-funcs.sh

@@ -25 +25 @@
          echo " o compiling with gcc 4.x"
          case ${target_glibc_ver} in
-            2.3.[6-9]* | 2.4.* ) ;;
+            2.3.[7-9]* | 2.4.* ) ;;
+            2.3.6 )
+               apply_patch glibc-20051024-localedef_segfault-1
+
+               case ${TGT_ARCH} in
+               sparc* )
+                  # fix CFLAGS-rtld to remove deprecated sparc compiler options
+                  # from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile 
+                  # ( -mv8 is no longer supported ). Use -mcpu -mtune options 
+                  # from TGT_CFLAGS (which get passed regardless)
+                  echo "   - removing deprecated gcc options from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
+                  file="sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
+                  if [ ! -f ${file}-ORIG ]; then cp -p ${file} ${file}-ORIG ; fi
+                  grep -v \\-mv8 ${file}-ORIG > ${file}
+               ;;
+               esac
+
+            ;;
             2.3.5 )
                # gcc4 support is working in CVS glibc
+
                if [ ! -d ${SRC}/${PKGDIR}/CVS ]; then
                   echo "   - applying gcc4 fixes"
@@ -38 +56 @@
                   apply_patch glibc-2.3.5-allow-gcc4-wcstol_l
                fi
+
                case ${TGT_ARCH} in
                sparc* )
@@ -118 +137 @@
             ${fname}-ORIG > ${fname}
          }
+
          case ${TGT_ARCH} in
             m68k* )
@@ -125 +145 @@
             arm* ) apply_patch glibc-arm-ctl_bus_isa ;;
          esac
+
       ;;
       2.4.2[4-9] | 2.4.3* )