Changeset 175f4d65
- Timestamp:
- Sep 22, 2008, 11:59:21 AM (16 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- ea11059
- Parents:
- 8aa6f1c2
- Location:
- patches
- Files:
-
- 3 deleted
- 4 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/glibc-2.8-libgcc_eh-1.patch
r8aa6f1c2 r175f4d65 7 7 the glibc will attempt to link to it. 8 8 9 Rediffed for 2.7 by Jim Gifford 9 Rediffed for 2.7 by Jim Gifford 10 Rediffed for 2.8 by Joe Ciccone 10 11 11 diff -Naur glibc-2.7.orig/Makeconfig glibc-2.7/Makeconfig 12 --- glibc-2.7.orig/Makeconfig 2007-07-05 15:03:47.000000000 -0700 13 +++ glibc-2.7/Makeconfig 2007-10-20 15:23:21.000000000 -0700 14 @@ -524,12 +524,20 @@ 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 @@ 16 AC_DEFINE(HAVE_CC_WITH_LIBUNWIND) 17 fi 18 19 + AC_CACHE_CHECK(whether to link against libgcc_eh, 20 + libc_cv_cc_with_libgcc_eh, [ 21 + cat > conftest.c <<EOF 22 +int main (void) { return 0; } 23 +EOF 24 + if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \ 25 + conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then 26 + libc_cv_cc_with_libgcc_eh=yes 27 + else 28 + libc_cv_cc_with_libgcc_eh=no 29 + fi 30 + rm -f conftest*]) 31 + AC_SUBST(libc_cv_cc_with_libgcc_eh) 32 + if test $libc_cv_cc_with_libgcc_eh = yes; then 33 + AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH) 34 + fi 35 + 36 AC_CACHE_CHECK(for -z nodelete option, 37 libc_cv_z_nodelete, [dnl 38 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 @@ 15 43 libunwind = -lunwind 16 44 endif … … 34 62 endif 35 63 ifeq ($(elf),yes) 36 diff -Naur glibc-2. 7.orig/config.make.in glibc-2.7/config.make.in37 --- glibc-2. 7.orig/config.make.in 2007-08-25 15:25:24.000000000 -070038 +++ glibc-2. 7/config.make.in 2007-10-20 15:23:21.000000000 -070064 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 39 67 @@ -60,6 +60,7 @@ 40 68 have-libaudit = @have_libaudit@ … … 45 73 bind-now = @bindnow@ 46 74 have-hash-style = @libc_cv_hashstyle@ 47 diff -Naur glibc-2. 7.orig/configure glibc-2.7/configure48 --- glibc-2. 7.orig/configure 2007-10-18 04:22:23.000000000 -070049 +++ glibc-2. 7/configure 2007-10-20 21:26:18.000000000 -070075 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 50 78 @@ -716,6 +716,7 @@ 51 79 BISON … … 56 84 libc_cv_libgcc_s_suffix 57 85 libc_cv_as_needed 58 @@ -60 45,6 +6046,33 @@86 @@ -6052,6 +6053,33 @@ 59 87 60 88 fi … … 90 118 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; } 91 119 if test "${libc_cv_z_nodelete+set}" = set; then 92 @@ -92 43,6 +9271,7 @@120 @@ -9250,6 +9278,7 @@ 93 121 BISON!$BISON$ac_delim 94 122 VERSIONING!$VERSIONING$ac_delim … … 98 126 libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim 99 127 libc_cv_as_needed!$libc_cv_as_needed$ac_delim 100 @@ -9 294,7 +9323,7 @@128 @@ -9301,7 +9330,7 @@ 101 129 LTLIBOBJS!$LTLIBOBJS$ac_delim 102 130 _ACEOF … … 107 135 elif $ac_last_try; then 108 136 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 109 diff -Naur glibc-2.7.orig/configure.in glibc-2.7/configure.in110 --- glibc-2.7.orig/configure.in 2007-06-07 20:16:36.000000000 -0700111 +++ glibc-2.7/configure.in 2007-10-20 15:23:21.000000000 -0700112 @@ -1388,6 +1388,23 @@113 AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)114 fi115 116 + AC_CACHE_CHECK(whether to link against libgcc_eh,117 + libc_cv_cc_with_libgcc_eh, [118 + cat > conftest.c <<EOF119 +int main (void) { return 0; }120 +EOF121 + if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \122 + conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then123 + libc_cv_cc_with_libgcc_eh=yes124 + else125 + libc_cv_cc_with_libgcc_eh=no126 + fi127 + rm -f conftest*])128 + AC_SUBST(libc_cv_cc_with_libgcc_eh)129 + if test $libc_cv_cc_with_libgcc_eh = yes; then130 + AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)131 + fi132 +133 AC_CACHE_CHECK(for -z nodelete option,134 libc_cv_z_nodelete, [dnl135 cat > conftest.c <<EOF136 -
patches/glibc-2.8-localedef_segfault-1.patch
r8aa6f1c2 r175f4d65 7 7 This problem is only noticed when using PaX 8 8 and some architectures besides x86. 9 9 See debian bug # 231438 10 10 11 diff -Naur glibc-2.6.orig/locale/programs/3level.h glibc-2.6/locale/programs/3level.h 12 --- glibc-2.6.orig/locale/programs/3level.h 2005-12-06 21:47:27.000000000 -0800 13 +++ glibc-2.6/locale/programs/3level.h 2007-05-19 13:38:01.000000000 -0700 14 @@ -202,6 +202,42 @@ 11 Rediffed for 2.8 by Joe Ciccone 12 13 diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h 14 --- glibc-2.8.orig/locale/programs/3level.h 2007-07-15 20:54:59.000000000 -0400 15 +++ glibc-2.8/locale/programs/3level.h 2008-09-20 12:09:34.000000000 -0400 16 @@ -203,6 +203,42 @@ 15 17 } 16 18 }
Note:
See TracChangeset
for help on using the changeset viewer.