Changeset dbb2738d
- Timestamp:
- Jan 17, 2009, 11:35:02 PM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 8377528
- Parents:
- ef18c05
- Location:
- patches
- Files:
-
- 2 deleted
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/glibc-2.9-libgcc_eh-1.patch
ref18c05 rdbb2738d 1 Submitted By: Joe Ciccone <jciccone@ linuxfromscratch.org>1 Submitted By: Joe Ciccone <jciccone@gmail.com> 2 2 Date: 2006-11-09 3 3 Initial Package Version: 2.5 … … 9 9 Rediffed for 2.7 by Jim Gifford 10 10 Rediffed for 2.8 by Joe Ciccone 11 Rediffed for 2.9 by Joe Ciccone 11 12 12 diff -Naur glibc-2.8.orig/configure.in glibc-2.8/configure.in 13 --- glibc-2.8.orig/configure.in 2008-04-11 13:52:55.000000000 -0400 14 +++ glibc-2.8/configure.in 2008-09-20 12:06:26.000000000 -0400 15 @@ -1395,6 +1395,23 @@ 13 diff -Naur glibc-2.9.orig/config.make.in glibc-2.9/config.make.in 14 --- glibc-2.9.orig/config.make.in 2008-08-18 05:42:17.000000000 -0400 15 +++ glibc-2.9/config.make.in 2008-12-17 08:23:59.000000000 -0500 16 @@ -60,6 +60,7 @@ 17 have-libaudit = @have_libaudit@ 18 have-libcap = @have_libcap@ 19 have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ 20 +have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@ 21 fno-unit-at-a-time = @fno_unit_at_a_time@ 22 bind-now = @bindnow@ 23 have-hash-style = @libc_cv_hashstyle@ 24 diff -Naur glibc-2.9.orig/configure.in glibc-2.9/configure.in 25 --- glibc-2.9.orig/configure.in 2008-11-27 19:05:05.000000000 -0500 26 +++ glibc-2.9/configure.in 2008-12-17 08:21:56.000000000 -0500 27 @@ -1394,6 +1394,23 @@ 16 28 AC_DEFINE(HAVE_CC_WITH_LIBUNWIND) 17 29 fi … … 37 49 libc_cv_z_nodelete, [dnl 38 50 cat > conftest.c <<EOF 39 diff -Naur glibc-2.8.orig/Makeconfig glibc-2.8/Makeconfig 40 --- glibc-2.8.orig/Makeconfig 2008-01-31 19:01:12.000000000 -0500 41 +++ glibc-2.8/Makeconfig 2008-09-20 12:06:26.000000000 -0400 42 @@ -525,12 +525,20 @@ 43 libunwind = -lunwind 44 endif 45 ifneq ($(have-as-needed),yes) 46 +ifneq ($(have-cc-with-libgcc_eh),yes) 47 + libgcc_eh := $(libunwind) 48 +else 49 libgcc_eh := -lgcc_eh $(libunwind) 50 +endif 51 else 52 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed 53 endif 54 gnulib := -lgcc $(libgcc_eh) 55 -static-gnulib := -lgcc -lgcc_eh $(libunwind) 56 +ifneq ($(have-cc-with-libgcc_eh),yes) 57 + static-gnulib := -lgcc $(libunwind) 58 +else 59 + static-gnulib := -lgcc -lgcc_eh $(libunwind) 60 +endif 61 libc.so-gnulib := -lgcc 62 endif 63 ifeq ($(elf),yes) 64 diff -Naur glibc-2.8.orig/config.make.in glibc-2.8/config.make.in 65 --- glibc-2.8.orig/config.make.in 2007-08-25 18:25:24.000000000 -0400 66 +++ glibc-2.8/config.make.in 2008-09-20 12:06:26.000000000 -0400 67 @@ -60,6 +60,7 @@ 68 have-libaudit = @have_libaudit@ 69 have-libcap = @have_libcap@ 70 have-cc-with-libunwind = @libc_cv_cc_with_libunwind@ 71 +have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@ 72 fno-unit-at-a-time = @fno_unit_at_a_time@ 73 bind-now = @bindnow@ 74 have-hash-style = @libc_cv_hashstyle@ 75 diff -Naur glibc-2.8.orig/configure glibc-2.8/configure 76 --- glibc-2.8.orig/configure 2008-09-01 16:01:43.000000000 -0400 77 +++ glibc-2.8/configure 2008-09-20 12:06:26.000000000 -0400 51 diff -Naur glibc-2.9.orig/configure glibc-2.9/configure 52 --- glibc-2.9.orig/configure 2008-11-27 19:05:36.000000000 -0500 53 +++ glibc-2.9/configure 2008-12-17 08:24:21.000000000 -0500 78 54 @@ -716,6 +716,7 @@ 79 55 BISON … … 84 60 libc_cv_libgcc_s_suffix 85 61 libc_cv_as_needed 86 @@ -605 2,6 +6053,33 @@62 @@ -6053,6 +6054,33 @@ 87 63 88 64 fi … … 118 94 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; } 119 95 if test "${libc_cv_z_nodelete+set}" = set; then 120 @@ -92 50,6 +9278,7 @@96 @@ -9282,6 +9310,7 @@ 121 97 BISON!$BISON$ac_delim 122 98 VERSIONING!$VERSIONING$ac_delim … … 126 102 libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim 127 103 libc_cv_as_needed!$libc_cv_as_needed$ac_delim 128 @@ -93 01,7 +9330,7 @@104 @@ -9335,7 +9364,7 @@ 129 105 LTLIBOBJS!$LTLIBOBJS$ac_delim 130 106 _ACEOF 131 107 132 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5 2; then133 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 5 3; then108 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then 109 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then 134 110 break 135 111 elif $ac_last_try; then 136 112 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 113 diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig 114 --- glibc-2.9.orig/Makeconfig 2008-08-18 05:42:17.000000000 -0400 115 +++ glibc-2.9/Makeconfig 2008-12-17 08:23:42.000000000 -0500 116 @@ -525,12 +525,20 @@ 117 libunwind = -lunwind 118 endif 119 ifneq ($(have-as-needed),yes) 120 - libgcc_eh := -lgcc_eh $(libunwind) 121 + ifneq ($(have-cc-with-libgcc_eh),yes) 122 + libgcc_eh := $(libunwind) 123 + else 124 + libgcc_eh := -lgcc_eh $(libunwind) 125 + endif 126 else 127 libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed 128 endif 129 gnulib := -lgcc $(libgcc_eh) 130 -static-gnulib := -lgcc -lgcc_eh $(libunwind) 131 +ifneq ($(have-cc-with-libgcc_eh),yes) 132 + static-gnulib := -lgcc $(libunwind) 133 +else 134 + static-gnulib := -lgcc -lgcc_eh $(libunwind) 135 +endif 136 libc.so-gnulib := -lgcc 137 endif 138 ifeq ($(elf),yes) -
patches/glibc-2.9-localedef_segfault-1.patch
ref18c05 rdbb2738d 10 10 11 11 Rediffed for 2.8 by Joe Ciccone 12 Rediffed for 2.9 by Joe Ciccone 12 13 13 14 diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h
Note:
See TracChangeset
for help on using the changeset viewer.