Changeset 0054948


Ignore:
Timestamp:
Jun 4, 2009, 3:11:39 PM (12 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:
1ca4247
Parents:
d7e6976
Message:

Updated Zlib FPIC patch to -2

Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • BOOK/introduction/common/changelog.xml

    rd7e6976 r0054948  
    6161        <listitem>
    6262          <para>[Jim] - Updated Shadow to 4.1.4.1.</para>
     63        </listitem>
     64        <listitem>
     65          <para>[Jim] - Updated Zlib FPIC patch to -2.</para>
    6366        </listitem>
    6467      </itemizedlist>
  • BOOK/patches.ent

    rd7e6976 r0054948  
    113113<!ENTITY vim-branch_update-patch-size "265 KB">
    114114
    115 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
    116 <!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
     115<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-2.patch">
     116<!ENTITY zlib-fpic-patch-md5 "b1e6644c97b04c368e11c0a1554f2efe">
    117117<!ENTITY zlib-fpic-patch-size "3 KB">
    118118
  • patches/zlib-1.2.3-fPIC-2.patch

    rd7e6976 r0054948  
    1 Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
    2 Date: 2005-06-14
     1Submitted By: Jim Gifford  <jim at cross-lfs dot org>
     2Originally Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
     3Date: 2009-05-7
    34Initial Package Version: 1.2.2
    45Origin: Gentoo ebuild?
     
    1415Remove the --shared if you don't want the shared lib.
    1516
    16 diff -Naur zlib-1.2.2.orig/configure zlib-1.2.2/configure
    17 --- zlib-1.2.2.orig/configure   2004-09-07 00:50:06.000000000 -0500
    18 +++ zlib-1.2.2/configure        2005-02-05 01:34:08.553292416 -0600
     17diff -Naur zlib-1.2.3.orig/configure zlib-1.2.3/configure
     18--- zlib-1.2.3.orig/configure   2005-07-11 13:11:57.000000000 -0700
     19+++ zlib-1.2.3/configure        2009-05-07 12:09:31.000000000 -0700
     20@@ -23,7 +23,7 @@
     21 VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
     22 VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
     23 VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
     24-AR=${AR-"ar rc"}
     25+AR=${AR-"ar"}
     26 RANLIB=${RANLIB-"ranlib"}
     27 prefix=${prefix-/usr/local}
     28 exec_prefix=${exec_prefix-'${prefix}'}
    1929@@ -73,7 +73,11 @@
    2030 
     
    3040   case `(uname -s || echo unknown) 2>/dev/null` in
    3141   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
    32 @@ -158,7 +162,7 @@
     42@@ -174,7 +178,7 @@
    3343   if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
    3444      test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
     
    3949   elif test -z "$old_cc" -a -z "$old_cflags"; then
    4050     echo No shared library support.
    41 diff -Naur zlib-1.2.2.orig/Makefile.in zlib-1.2.2/Makefile.in
    42 --- zlib-1.2.2.orig/Makefile.in 2004-09-15 09:27:20.000000000 -0500
    43 +++ zlib-1.2.2/Makefile.in      2005-02-05 01:33:49.703158072 -0600
     51diff -Naur zlib-1.2.3.orig/Makefile.in zlib-1.2.3/Makefile.in
     52--- zlib-1.2.3.orig/Makefile.in 2005-07-17 19:25:21.000000000 -0700
     53+++ zlib-1.2.3/Makefile.in      2009-05-07 12:10:15.000000000 -0700
    4454@@ -49,6 +49,8 @@
    4555 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
     
    5161 # to use the asm code: make OBJA=match.o
    5262 
     63@@ -68,7 +70,7 @@
     64        fi
     65 
     66 libz.a: $(OBJS) $(OBJA)
     67-       $(AR) $@ $(OBJS) $(OBJA)
     68+       $(AR) rc $@ $(OBJS) $(OBJA)
     69        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
     70 
     71 match.o: match.S
    5372@@ -77,8 +79,11 @@
    5473        mv _match.o match.o
Note: See TracChangeset for help on using the changeset viewer.