| 1 |
jlec 12/11/29 21:00:14 |
| 2 |
|
| 3 |
Modified: shapelib-1.3.0-respect-user.patch |
| 4 |
Log: |
| 5 |
sci-libs/shapelib: Respect AR, #444548 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: shapelib-1.3.0-respect-user.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- shapelib-1.3.0-respect-user.patch 2 Aug 2012 23:24:26 -0000 1.1 |
| 23 |
+++ shapelib-1.3.0-respect-user.patch 29 Nov 2012 21:00:14 -0000 1.2 |
| 24 |
@@ -1,6 +1,11 @@ |
| 25 |
---- Makefile.orig 2012-08-02 23:51:00.000000000 +0100 |
| 26 |
-+++ Makefile 2012-08-03 00:19:37.000000000 +0100 |
| 27 |
-@@ -1,6 +1,6 @@ |
| 28 |
+ Makefile | 41 ++++++++++++++++++++--------------------- |
| 29 |
+ 1 file changed, 20 insertions(+), 21 deletions(-) |
| 30 |
+ |
| 31 |
+diff --git a/Makefile b/Makefile |
| 32 |
+index 0c41d8a..4149412 100644 |
| 33 |
+--- a/Makefile |
| 34 |
++++ b/Makefile |
| 35 |
+@@ -1,8 +1,9 @@ |
| 36 |
|
| 37 |
-PREFIX = /usr/local |
| 38 |
-CFLAGS = -g -Wall -fPIC |
| 39 |
@@ -8,8 +13,11 @@ |
| 40 |
+CFLAGS ?= -g -Wall -fPIC |
| 41 |
#CFLAGS = -g -DUSE_CPL |
| 42 |
#CC = g++ |
| 43 |
++AR ?= ar |
| 44 |
|
| 45 |
-@@ -10,7 +10,7 @@ |
| 46 |
+ LIBOBJ = shpopen.o dbfopen.o safileio.o shptree.o |
| 47 |
+ SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \ |
| 48 |
+@@ -10,7 +11,7 @@ SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \ |
| 49 |
|
| 50 |
default: all |
| 51 |
|
| 52 |
@@ -18,7 +26,7 @@ |
| 53 |
|
| 54 |
shpopen.o: shpopen.c shapefil.h |
| 55 |
$(CC) $(CFLAGS) -c shpopen.c |
| 56 |
-@@ -25,46 +25,46 @@ |
| 57 |
+@@ -25,46 +26,46 @@ safileio.o: safileio.c shapefil.h |
| 58 |
$(CC) $(CFLAGS) -c safileio.c |
| 59 |
|
| 60 |
shpcreate: shpcreate.c shpopen.o safileio.o |
| 61 |
@@ -77,7 +85,7 @@ |
| 62 |
@./stream1.sh > s1.out |
| 63 |
@if test "`diff s1.out stream1.out`" = '' ; then \ |
| 64 |
echo "******* Stream 1 Succeeded *********"; \ |
| 65 |
-@@ -74,7 +74,7 @@ |
| 66 |
+@@ -74,7 +75,7 @@ test1: |
| 67 |
diff s1.out stream1.out; \ |
| 68 |
fi |
| 69 |
|
| 70 |
@@ -86,7 +94,7 @@ |
| 71 |
@./stream2.sh > s2.out |
| 72 |
@if test "`diff s2.out stream2.out`" = '' ; then \ |
| 73 |
echo "******* Stream 2 Succeeded *********"; \ |
| 74 |
-@@ -85,7 +85,7 @@ |
| 75 |
+@@ -85,7 +86,7 @@ test2: |
| 76 |
diff s2.out stream2.out; \ |
| 77 |
fi |
| 78 |
|
| 79 |
@@ -95,14 +103,16 @@ |
| 80 |
@./makeshape.sh > s3.out |
| 81 |
@if test "`diff s3.out stream3.out`" = '' ; then \ |
| 82 |
echo "******* Stream 3 Succeeded *********"; \ |
| 83 |
-@@ -97,9 +97,7 @@ |
| 84 |
+@@ -97,10 +98,8 @@ test3: |
| 85 |
fi |
| 86 |
|
| 87 |
|
| 88 |
-lib: libshp.a |
| 89 |
- |
| 90 |
-libshp.a: $(LIBOBJ) |
| 91 |
+- ar r libshp.a $(LIBOBJ) |
| 92 |
+lib: $(LIBOBJ) |
| 93 |
- ar r libshp.a $(LIBOBJ) |
| 94 |
++ $(AR) r libshp.a $(LIBOBJ) |
| 95 |
|
| 96 |
lib_install: libshp.a |
| 97 |
+ cp libshp.a $(PREFIX)/lib |
Archives