| 1 |
jer 10/08/26 21:44:56 |
| 2 |
|
| 3 |
Modified: rzip-2.1-darwin.patch |
| 4 |
Log: |
| 5 |
Clean up patch. Respect LDFLAGS (bug #334589). |
| 6 |
|
| 7 |
(Portage version: 2.2_rc69/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-arch/rzip/files/rzip-2.1-darwin.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rzip/files/rzip-2.1-darwin.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rzip/files/rzip-2.1-darwin.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-arch/rzip/files/rzip-2.1-darwin.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: rzip-2.1-darwin.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-arch/rzip/files/rzip-2.1-darwin.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- rzip-2.1-darwin.patch 17 Jan 2010 19:30:04 -0000 1.1 |
| 23 |
+++ rzip-2.1-darwin.patch 26 Aug 2010 21:44:56 -0000 1.2 |
| 24 |
@@ -1,6 +1,5 @@ |
| 25 |
-diff -r -uN rzip-2.1/configure.in rzip-2.1-patched/configure.in |
| 26 |
---- rzip-2.1/configure.in 2003-11-03 09:19:11.000000000 +0100 |
| 27 |
-+++ rzip-2.1-patched/configure.in 2008-07-27 21:59:45.774740303 +0200 |
| 28 |
+--- a/configure.in 2003-11-03 09:19:11.000000000 +0100 |
| 29 |
++++ b/configure.in 2008-07-27 21:59:45.774740303 +0200 |
| 30 |
@@ -2,6 +2,12 @@ |
| 31 |
AC_INIT(main.c) |
| 32 |
AC_CONFIG_HEADER(config.h) |
| 33 |
@@ -41,9 +40,8 @@ |
| 34 |
+AC_CHECK_FUNCS(strndup) |
| 35 |
|
| 36 |
AC_OUTPUT(Makefile) |
| 37 |
-diff -r -uN rzip-2.1/main.c rzip-2.1-patched/main.c |
| 38 |
---- rzip-2.1/main.c 2006-02-14 01:38:23.000000000 +0100 |
| 39 |
-+++ rzip-2.1-patched/main.c 2008-07-27 22:00:28.298071207 +0200 |
| 40 |
+--- a/main.c 2006-02-14 01:38:23.000000000 +0100 |
| 41 |
++++ b/main.c 2008-07-27 22:00:28.298071207 +0200 |
| 42 |
@@ -18,6 +18,7 @@ |
| 43 |
/* rzip compression - main program */ |
| 44 |
|
| 45 |
@@ -52,40 +50,8 @@ |
| 46 |
|
| 47 |
static void usage(void) |
| 48 |
{ |
| 49 |
-diff -r -uN rzip-2.1/Makefile.in rzip-2.1-patched/Makefile.in |
| 50 |
---- rzip-2.1/Makefile.in 2006-02-14 01:38:23.000000000 +0100 |
| 51 |
-+++ rzip-2.1-patched/Makefile.in 2008-07-27 21:58:08.201419790 +0200 |
| 52 |
-@@ -3,8 +3,8 @@ |
| 53 |
- |
| 54 |
- prefix=@prefix@ |
| 55 |
- exec_prefix=@exec_prefix@ |
| 56 |
--INSTALL_BIN=$(exec_prefix)/bin |
| 57 |
--INSTALL_MAN=$(prefix)/man |
| 58 |
-+INSTALL_BIN=$(DESTDIR)/@bindir@ |
| 59 |
-+INSTALL_MAN=$(DESTDIR)/@mandir@ |
| 60 |
- |
| 61 |
- LIBS=@LIBS@ |
| 62 |
- CC=@CC@ |
| 63 |
-@@ -20,7 +20,7 @@ |
| 64 |
- .SUFFIXES: |
| 65 |
- .SUFFIXES: .c .o |
| 66 |
- |
| 67 |
--OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o |
| 68 |
-+OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o |
| 69 |
- |
| 70 |
- # note that the -I. is needed to handle config.h when using VPATH |
| 71 |
- .c.o: |
| 72 |
-@@ -35,6 +35,7 @@ |
| 73 |
- ${INSTALLCMD} -m 755 rzip ${INSTALL_BIN} |
| 74 |
- -mkdir -p ${INSTALL_MAN}/man1 |
| 75 |
- ${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/ |
| 76 |
-+ ln -s rzip $(INSTALL_BIN)/runzip |
| 77 |
- |
| 78 |
- rzip: $(OBJS) |
| 79 |
- $(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS) |
| 80 |
-diff -r -uN rzip-2.1/rzip.h rzip-2.1-patched/rzip.h |
| 81 |
---- rzip-2.1/rzip.h 2006-02-14 01:38:23.000000000 +0100 |
| 82 |
-+++ rzip-2.1-patched/rzip.h 2008-07-27 21:58:08.204752617 +0200 |
| 83 |
+--- a/rzip.h 2006-02-14 01:38:23.000000000 +0100 |
| 84 |
++++ b/rzip.h 2008-07-27 21:58:08.204752617 +0200 |
| 85 |
@@ -94,7 +94,7 @@ |
| 86 |
#define strerror(i) sys_errlist[i] |
| 87 |
#endif |
| 88 |
@@ -95,9 +61,8 @@ |
| 89 |
extern int errno; |
| 90 |
#endif |
| 91 |
|
| 92 |
-diff -r -uN rzip-2.1/strutils.c rzip-2.1-patched/strutils.c |
| 93 |
---- rzip-2.1/strutils.c 1970-01-01 01:00:00.000000000 +0100 |
| 94 |
-+++ rzip-2.1-patched/strutils.c 2008-07-27 21:58:08.204752617 +0200 |
| 95 |
+--- a/strutils.c 1970-01-01 01:00:00.000000000 +0100 |
| 96 |
++++ b/strutils.c 2008-07-27 21:58:08.204752617 +0200 |
| 97 |
@@ -0,0 +1,29 @@ |
| 98 |
+/* |
| 99 |
+ Copyright (C) 2005 Gentoo Foundation |
| 100 |
@@ -128,9 +93,8 @@ |
| 101 |
+ return(memcpy(ret, s, n)); |
| 102 |
+} |
| 103 |
+#endif |
| 104 |
-diff -r -uN rzip-2.1/strutils.h rzip-2.1-patched/strutils.h |
| 105 |
---- rzip-2.1/strutils.h 1970-01-01 01:00:00.000000000 +0100 |
| 106 |
-+++ rzip-2.1-patched/strutils.h 2008-07-27 21:58:08.204752617 +0200 |
| 107 |
+--- a/strutils.h 1970-01-01 01:00:00.000000000 +0100 |
| 108 |
++++ b/strutils.h 2008-07-27 21:58:08.204752617 +0200 |
| 109 |
@@ -0,0 +1,31 @@ |
| 110 |
+/* |
| 111 |
+ Copyright (C) 2005 Gentoo Foundation |
| 112 |
@@ -163,3 +127,37 @@ |
| 113 |
+# endif |
| 114 |
+ |
| 115 |
+#endif |
| 116 |
+--- a/Makefile.in 2006-02-14 01:38:23.000000000 +0100 |
| 117 |
++++ b/Makefile.in 2010-08-26 23:34:38.000000000 +0200 |
| 118 |
+@@ -3,8 +3,8 @@ |
| 119 |
+ |
| 120 |
+ prefix=@prefix@ |
| 121 |
+ exec_prefix=@exec_prefix@ |
| 122 |
+-INSTALL_BIN=$(exec_prefix)/bin |
| 123 |
+-INSTALL_MAN=$(prefix)/man |
| 124 |
++INSTALL_BIN=$(DESTDIR)/@bindir@ |
| 125 |
++INSTALL_MAN=$(DESTDIR)/@mandir@ |
| 126 |
+ |
| 127 |
+ LIBS=@LIBS@ |
| 128 |
+ CC=@CC@ |
| 129 |
+@@ -20,7 +20,7 @@ |
| 130 |
+ .SUFFIXES: |
| 131 |
+ .SUFFIXES: .c .o |
| 132 |
+ |
| 133 |
+-OBJS= rzip.o runzip.o main.o stream.o util.o crc32.o |
| 134 |
++OBJS= rzip.o runzip.o strutils.o main.o stream.o util.o crc32.o |
| 135 |
+ |
| 136 |
+ # note that the -I. is needed to handle config.h when using VPATH |
| 137 |
+ .c.o: |
| 138 |
+@@ -35,9 +35,10 @@ |
| 139 |
+ ${INSTALLCMD} -m 755 rzip ${INSTALL_BIN} |
| 140 |
+ -mkdir -p ${INSTALL_MAN}/man1 |
| 141 |
+ ${INSTALLCMD} -m 644 $(srcdir)/rzip.1 ${INSTALL_MAN}/man1/ |
| 142 |
++ ln -s rzip $(INSTALL_BIN)/runzip |
| 143 |
+ |
| 144 |
+ rzip: $(OBJS) |
| 145 |
+- $(CC) $(CFLAGS) -o rzip $(OBJS) $(LIBS) |
| 146 |
++ $(CC) $(CFLAGS) $(LDFLAGS) -o rzip $(OBJS) $(LIBS) |
| 147 |
+ |
| 148 |
+ rzip.1: rzip.yo |
| 149 |
+ yodl2man -o rzip.1 rzip.yo |
Archives