Changeset dbb2738d

Timestamp:

Jan 17, 2009, 3:35:02 PM (16 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

8377528

Parents:

ef18c05

Message:

Update Patches.

Location:

patches

Files:

• glibc-2.8-alpha_fixes-1.patch (deleted)
• glibc-2.8-mawk_fix-1.patch (deleted)
• glibc-2.9-libgcc_eh-1.patch (moved) (moved from patches/glibc-2.8-libgcc_eh-1.patch ) (6 diffs)
• glibc-2.9-localedef_segfault-1.patch (moved) (moved from patches/glibc-2.8-localedef_segfault-1.patch ) (1 diff)

patches/glibc-2.9-libgcc_eh-1.patch

@@ -1 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
+Submitted By: Joe Ciccone <jciccone@gmail.com>
 Date: 2006-11-09
 Initial Package Version: 2.5
@@ -9 +9 @@
              Rediffed for 2.7 by Jim Gifford
              Rediffed for 2.8 by Joe Ciccone
+             Rediffed for 2.9 by Joe Ciccone
 
-diff -Naur glibc-2.8.orig/configure.in glibc-2.8/configure.in
---- glibc-2.8.orig/configure.in 2008-04-11 13:52:55.000000000 -0400
-+++ glibc-2.8/configure.in      2008-09-20 12:06:26.000000000 -0400
-@@ -1395,6 +1395,23 @@
+diff -Naur glibc-2.9.orig/config.make.in glibc-2.9/config.make.in
+--- glibc-2.9.orig/config.make.in       2008-08-18 05:42:17.000000000 -0400
++++ glibc-2.9/config.make.in    2008-12-17 08:23:59.000000000 -0500
+@@ -60,6 +60,7 @@
+ have-libaudit = @have_libaudit@
+ have-libcap = @have_libcap@
+ have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
++have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
+ fno-unit-at-a-time = @fno_unit_at_a_time@
+ bind-now = @bindnow@
+ have-hash-style = @libc_cv_hashstyle@
+diff -Naur glibc-2.9.orig/configure.in glibc-2.9/configure.in
+--- glibc-2.9.orig/configure.in 2008-11-27 19:05:05.000000000 -0500
++++ glibc-2.9/configure.in      2008-12-17 08:21:56.000000000 -0500
+@@ -1394,6 +1394,23 @@
      AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    fi
@@ -37 +49 @@
                  libc_cv_z_nodelete, [dnl
    cat > conftest.c <<EOF
-diff -Naur glibc-2.8.orig/Makeconfig glibc-2.8/Makeconfig
---- glibc-2.8.orig/Makeconfig   2008-01-31 19:01:12.000000000 -0500
-+++ glibc-2.8/Makeconfig        2008-09-20 12:06:26.000000000 -0400
-@@ -525,12 +525,20 @@
-   libunwind = -lunwind
- endif
- ifneq ($(have-as-needed),yes)
-+ifneq ($(have-cc-with-libgcc_eh),yes)
-+ libgcc_eh := $(libunwind)
-+else
-  libgcc_eh := -lgcc_eh $(libunwind)
-+endif
- else
-  libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
- endif
- gnulib := -lgcc $(libgcc_eh)
--static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+ifneq ($(have-cc-with-libgcc_eh),yes)
-+ static-gnulib := -lgcc $(libunwind)
-+else
-+ static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+endif
- libc.so-gnulib := -lgcc
- endif
- ifeq ($(elf),yes)
-diff -Naur glibc-2.8.orig/config.make.in glibc-2.8/config.make.in
---- glibc-2.8.orig/config.make.in       2007-08-25 18:25:24.000000000 -0400
-+++ glibc-2.8/config.make.in    2008-09-20 12:06:26.000000000 -0400
-@@ -60,6 +60,7 @@
- have-libaudit = @have_libaudit@
- have-libcap = @have_libcap@
- have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
-+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
- fno-unit-at-a-time = @fno_unit_at_a_time@
- bind-now = @bindnow@
- have-hash-style = @libc_cv_hashstyle@
-diff -Naur glibc-2.8.orig/configure glibc-2.8/configure
---- glibc-2.8.orig/configure    2008-09-01 16:01:43.000000000 -0400
-+++ glibc-2.8/configure 2008-09-20 12:06:26.000000000 -0400
+diff -Naur glibc-2.9.orig/configure glibc-2.9/configure
+--- glibc-2.9.orig/configure    2008-11-27 19:05:36.000000000 -0500
++++ glibc-2.9/configure 2008-12-17 08:24:21.000000000 -0500
 @@ -716,6 +716,7 @@
  BISON
@@ -84 +60 @@
  libc_cv_libgcc_s_suffix
  libc_cv_as_needed
-@@ -6052,6 +6053,33 @@
+@@ -6053,6 +6054,33 @@
  
    fi
@@ -118 +94 @@
  echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
  if test "${libc_cv_z_nodelete+set}" = set; then
-@@ -9250,6 +9278,7 @@
+@@ -9282,6 +9310,7 @@
  BISON!$BISON$ac_delim
  VERSIONING!$VERSIONING$ac_delim
@@ -126 +102 @@
  libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
  libc_cv_as_needed!$libc_cv_as_needed$ac_delim
-@@ -9301,7 +9330,7 @@
+@@ -9335,7 +9364,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig
+--- glibc-2.9.orig/Makeconfig   2008-08-18 05:42:17.000000000 -0400
++++ glibc-2.9/Makeconfig        2008-12-17 08:23:42.000000000 -0500
+@@ -525,12 +525,20 @@
+   libunwind = -lunwind
+ endif
+ ifneq ($(have-as-needed),yes)
+- libgcc_eh := -lgcc_eh $(libunwind)
++ ifneq ($(have-cc-with-libgcc_eh),yes)
++  libgcc_eh := $(libunwind)
++ else
++  libgcc_eh := -lgcc_eh $(libunwind)
++ endif
+ else
+  libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
+ endif
+ gnulib := -lgcc $(libgcc_eh)
+-static-gnulib := -lgcc -lgcc_eh $(libunwind)
++ifneq ($(have-cc-with-libgcc_eh),yes)
++ static-gnulib := -lgcc $(libunwind)
++else
++ static-gnulib := -lgcc -lgcc_eh $(libunwind)
++endif
+ libc.so-gnulib := -lgcc
+ endif
+ ifeq ($(elf),yes)

patches/glibc-2.9-localedef_segfault-1.patch

@@ -10 +10 @@
 
              Rediffed for 2.8 by Joe Ciccone
+             Rediffed for 2.9 by Joe Ciccone
 
 diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h