Changeset dbb2738d


Ignore:
Timestamp:
Jan 17, 2009, 3:35:02 PM (14 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:
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>
     1Submitted By: Joe Ciccone <jciccone@gmail.com>
    22Date: 2006-11-09
    33Initial Package Version: 2.5
     
    99             Rediffed for 2.7 by Jim Gifford
    1010             Rediffed for 2.8 by Joe Ciccone
     11             Rediffed for 2.9 by Joe Ciccone
    1112
    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 @@
     13diff -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@
     24diff -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 @@
    1628     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
    1729   fi
     
    3749                 libc_cv_z_nodelete, [dnl
    3850   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
     51diff -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
    7854@@ -716,6 +716,7 @@
    7955 BISON
     
    8460 libc_cv_libgcc_s_suffix
    8561 libc_cv_as_needed
    86 @@ -6052,6 +6053,33 @@
     62@@ -6053,6 +6054,33 @@
    8763 
    8864   fi
     
    11894 echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
    11995 if test "${libc_cv_z_nodelete+set}" = set; then
    120 @@ -9250,6 +9278,7 @@
     96@@ -9282,6 +9310,7 @@
    12197 BISON!$BISON$ac_delim
    12298 VERSIONING!$VERSIONING$ac_delim
     
    126102 libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
    127103 libc_cv_as_needed!$libc_cv_as_needed$ac_delim
    128 @@ -9301,7 +9330,7 @@
     104@@ -9335,7 +9364,7 @@
    129105 LTLIBOBJS!$LTLIBOBJS$ac_delim
    130106 _ACEOF
    131107 
    132 -  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
    133 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
     108-  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
    134110     break
    135111   elif $ac_last_try; then
    136112     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
     113diff -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  
    1010
    1111             Rediffed for 2.8 by Joe Ciccone
     12             Rediffed for 2.9 by Joe Ciccone
    1213
    1314diff -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.