Changeset 0054948

Timestamp:

Jun 4, 2009, 3:11:39 PM (15 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:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/zlib-1.2.3-fPIC-2.patch (moved) (moved from patches/zlib-1.2.3-fPIC-1.patch ) (5 diffs)

BOOK/introduction/common/changelog.xml

@@ -61 +61 @@
         <listitem>
           <para>[Jim] - Updated Shadow to 4.1.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated Zlib FPIC patch to -2.</para>
         </listitem>
       </itemizedlist>

BOOK/patches.ent

@@ -113 +113 @@
 <!ENTITY vim-branch_update-patch-size "265 KB">
 
-<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
-<!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
+<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-2.patch">
+<!ENTITY zlib-fpic-patch-md5 "b1e6644c97b04c368e11c0a1554f2efe">
 <!ENTITY zlib-fpic-patch-size "3 KB">
 

patches/zlib-1.2.3-fPIC-2.patch

@@ -1 @@
-Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
-Date: 2005-06-14
+Submitted By: Jim Gifford  <jim at cross-lfs dot org>
+Originally Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
+Date: 2009-05-7
 Initial Package Version: 1.2.2
 Origin: Gentoo ebuild?
@@ -14 +15 @@
 Remove the --shared if you don't want the shared lib.
 
-diff -Naur zlib-1.2.2.orig/configure zlib-1.2.2/configure
---- zlib-1.2.2.orig/configure   2004-09-07 00:50:06.000000000 -0500
-+++ zlib-1.2.2/configure        2005-02-05 01:34:08.553292416 -0600
+diff -Naur zlib-1.2.3.orig/configure zlib-1.2.3/configure
+--- zlib-1.2.3.orig/configure   2005-07-11 13:11:57.000000000 -0700
++++ zlib-1.2.3/configure        2009-05-07 12:09:31.000000000 -0700
+@@ -23,7 +23,7 @@
+ VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
+ VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
+ VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
+-AR=${AR-"ar rc"}
++AR=${AR-"ar"}
+ RANLIB=${RANLIB-"ranlib"}
+ prefix=${prefix-/usr/local}
+ exec_prefix=${exec_prefix-'${prefix}'}
 @@ -73,7 +73,11 @@
  
@@ -30 +40 @@
    case `(uname -s || echo unknown) 2>/dev/null` in
    Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
-@@ -158,7 +162,7 @@
+@@ -174,7 +178,7 @@
    if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
       test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
@@ -39 +49 @@
    elif test -z "$old_cc" -a -z "$old_cflags"; then
      echo No shared library support.
-diff -Naur zlib-1.2.2.orig/Makefile.in zlib-1.2.2/Makefile.in
---- zlib-1.2.2.orig/Makefile.in 2004-09-15 09:27:20.000000000 -0500
-+++ zlib-1.2.2/Makefile.in      2005-02-05 01:33:49.703158072 -0600
+diff -Naur zlib-1.2.3.orig/Makefile.in zlib-1.2.3/Makefile.in
+--- zlib-1.2.3.orig/Makefile.in 2005-07-17 19:25:21.000000000 -0700
++++ zlib-1.2.3/Makefile.in      2009-05-07 12:10:15.000000000 -0700
 @@ -49,6 +49,8 @@
  OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
@@ -51 +61 @@
  # to use the asm code: make OBJA=match.o
  
+@@ -68,7 +70,7 @@
+        fi
+ 
+ libz.a: $(OBJS) $(OBJA)
+-       $(AR) $@ $(OBJS) $(OBJA)
++       $(AR) rc $@ $(OBJS) $(OBJA)
+        -@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+ 
+ match.o: match.S
 @@ -77,8 +79,11 @@
         mv _match.o match.o