From 4a744a5e33fa88640e00dc746f4388acefa09637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Wed, 18 Mar 2009 11:47:38 +0000 Subject: [PATCH] remove obsoleted patches --- zlib-1.1.4-make-test.patch | 23 ----------------------- zlib-1.2.3-cflags.patch | 20 -------------------- zlib-1.2.3-lib.patch | 11 ----------- 3 files changed, 54 deletions(-) delete mode 100644 zlib-1.1.4-make-test.patch delete mode 100644 zlib-1.2.3-cflags.patch delete mode 100644 zlib-1.2.3-lib.patch diff --git a/zlib-1.1.4-make-test.patch b/zlib-1.1.4-make-test.patch deleted file mode 100644 index fecb0aa..0000000 --- a/zlib-1.1.4-make-test.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- zlib-1.1.4/Makefile.in.jj Mon Mar 11 08:58:30 2002 -+++ zlib-1.1.4/Makefile.in Fri Apr 26 06:53:12 2002 -@@ -62,13 +62,16 @@ all: example minigzip - - test: all - @LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \ -- echo hello world | ./minigzip | ./minigzip -d || \ -- echo ' *** minigzip test FAILED ***' ; \ -+ ret=0; \ -+ if ! echo hello world | ./minigzip | ./minigzip -d; then \ -+ echo ' *** minigzip test FAILED ***'; ret=1; \ -+ fi; \ - if ./example; then \ - echo ' *** zlib test OK ***'; \ - else \ -- echo ' *** zlib test FAILED ***'; \ -- fi -+ echo ' *** zlib test FAILED ***'; ret=1; \ -+ fi; \ -+ exit $$ret - - libz.a: $(OBJS) $(OBJA) - $(AR) $@ $(OBJS) $(OBJA) diff --git a/zlib-1.2.3-cflags.patch b/zlib-1.2.3-cflags.patch deleted file mode 100644 index 0aa8969..0000000 --- a/zlib-1.2.3-cflags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- zlib-1.2.3/configure.cflags 2005-07-11 22:11:57.000000000 +0200 -+++ zlib-1.2.3/configure 2006-07-19 09:47:58.000000000 +0200 -@@ -76,7 +76,7 @@ - SFLAGS=${CFLAGS-"-fPIC -O3"} - CFLAGS="$cflags" - case `(uname -s || echo unknown) 2>/dev/null` in -- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; -+ Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc $CFLAGS -shared -Wl,-soname,libz.so.1"};; - CYGWIN* | Cygwin* | cygwin* | OS/2* ) - EXE='.exe';; - QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 -@@ -97,7 +97,7 @@ - SHAREDLIBV=libz.$VER$shared_ext - SHAREDLIBM=libz.$VER1$shared_ext - LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; -- *) LDSHARED=${LDSHARED-"$cc -shared"};; -+ *) LDSHARED=${LDSHARED-"$cc $CFLAGS -shared"};; - esac - else - # find system name and corresponding cc options diff --git a/zlib-1.2.3-lib.patch b/zlib-1.2.3-lib.patch deleted file mode 100644 index ed775f1..0000000 --- a/zlib-1.2.3-lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zlib-1.2.3/Makefile.in.lib 2006-10-09 14:50:05.000000000 +0200 -+++ zlib-1.2.3/Makefile.in 2006-10-09 14:51:00.000000000 +0200 -@@ -100,7 +100,7 @@ - cp zlib.h zconf.h $(includedir) - chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h - cp $(LIBS) $(libdir) -- cd $(libdir); chmod 755 $(LIBS) -+ cd $(libdir); - -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1 - cd $(libdir); if test -f $(SHAREDLIBV); then \ - rm -f $(SHAREDLIB) $(SHAREDLIBM); \