| 1 |
bicatali 12/08/02 23:24:26 |
| 2 |
|
| 3 |
Added: shapelib-1.3.0-respect-user.patch |
| 4 |
Log: |
| 5 |
added a patch to respect user flags, fixed bad installation, define tests |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 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.1&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.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: shapelib-1.3.0-respect-user.patch |
| 16 |
=================================================================== |
| 17 |
--- Makefile.orig 2012-08-02 23:51:00.000000000 +0100 |
| 18 |
+++ Makefile 2012-08-03 00:19:37.000000000 +0100 |
| 19 |
@@ -1,6 +1,6 @@ |
| 20 |
|
| 21 |
-PREFIX = /usr/local |
| 22 |
-CFLAGS = -g -Wall -fPIC |
| 23 |
+PREFIX ?= /usr/localxs |
| 24 |
+CFLAGS ?= -g -Wall -fPIC |
| 25 |
#CFLAGS = -g -DUSE_CPL |
| 26 |
#CC = g++ |
| 27 |
|
| 28 |
@@ -10,7 +10,7 @@ |
| 29 |
|
| 30 |
default: all |
| 31 |
|
| 32 |
-all: $(SHPBIN) shptest lib |
| 33 |
+all: $(SHPBIN) lib |
| 34 |
|
| 35 |
shpopen.o: shpopen.c shapefil.h |
| 36 |
$(CC) $(CFLAGS) -c shpopen.c |
| 37 |
@@ -25,46 +25,46 @@ |
| 38 |
$(CC) $(CFLAGS) -c safileio.c |
| 39 |
|
| 40 |
shpcreate: shpcreate.c shpopen.o safileio.o |
| 41 |
- $(CC) $(CFLAGS) shpcreate.c shpopen.o safileio.o $(LINKOPT) -o shpcreate |
| 42 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shpcreate.c shpopen.o safileio.o -o shpcreate |
| 43 |
|
| 44 |
shpadd: shpadd.c shpopen.o safileio.o |
| 45 |
- $(CC) $(CFLAGS) shpadd.c shpopen.o safileio.o $(LINKOPT) -o shpadd |
| 46 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shpadd.c shpopen.o safileio.o -o shpadd |
| 47 |
|
| 48 |
shpdump: shpdump.c shpopen.o safileio.o |
| 49 |
- $(CC) $(CFLAGS) shpdump.c shpopen.o safileio.o $(LINKOPT) -o shpdump |
| 50 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shpdump.c shpopen.o safileio.o -o shpdump |
| 51 |
|
| 52 |
shprewind: shprewind.c shpopen.o safileio.o |
| 53 |
- $(CC) $(CFLAGS) shprewind.c shpopen.o safileio.o $(LINKOPT) -o shprewind |
| 54 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shprewind.c shpopen.o safileio.o -o shprewind |
| 55 |
|
| 56 |
dbfcreate: dbfcreate.c dbfopen.o safileio.o |
| 57 |
- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o safileio.o $(LINKOPT) -o dbfcreate |
| 58 |
+ $(CC) $(CFLAGS) $(LDFLAGS) dbfcreate.c dbfopen.o safileio.o -o dbfcreate |
| 59 |
|
| 60 |
dbfadd: dbfadd.c dbfopen.o safileio.o |
| 61 |
- $(CC) $(CFLAGS) dbfadd.c dbfopen.o safileio.o $(LINKOPT) -o dbfadd |
| 62 |
+ $(CC) $(CFLAGS) $(LDFLAGS) dbfadd.c dbfopen.o safileio.o -o dbfadd |
| 63 |
|
| 64 |
dbfdump: dbfdump.c dbfopen.o safileio.o |
| 65 |
- $(CC) $(CFLAGS) dbfdump.c dbfopen.o safileio.o $(LINKOPT) -o dbfdump |
| 66 |
+ $(CC) $(CFLAGS) $(LDFLAGS) dbfdump.c dbfopen.o safileio.o -o dbfdump |
| 67 |
|
| 68 |
shptest: shptest.c shpopen.o safileio.o |
| 69 |
- $(CC) $(CFLAGS) shptest.c shpopen.o safileio.o $(LINKOPT) -o shptest |
| 70 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shptest.c shpopen.o safileio.o -o shptest |
| 71 |
|
| 72 |
shputils: shputils.c shpopen.o safileio.o dbfopen.o |
| 73 |
- $(CC) $(CFLAGS) shputils.c shpopen.o safileio.o dbfopen.o $(LINKOPT) -o shputils |
| 74 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shputils.c shpopen.o safileio.o dbfopen.o -o shputils |
| 75 |
|
| 76 |
shptreedump: shptreedump.c shptree.o shpopen.o safileio.o |
| 77 |
- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o safileio.o $(LINKOPT) \ |
| 78 |
+ $(CC) $(CFLAGS) $(LDFLAGS) shptreedump.c shptree.o shpopen.o safileio.o \ |
| 79 |
-o shptreedump |
| 80 |
|
| 81 |
clean: |
| 82 |
rm -f *.o shptest $(SHPBIN) libshp.a |
| 83 |
|
| 84 |
-test: test2 test3 |
| 85 |
+test: shptest test2 test3 |
| 86 |
|
| 87 |
# |
| 88 |
# Note this stream only works if example data is accessable. |
| 89 |
# Fetch ftp://gdal.velocet.ca/pub/outgoing/shape_eg_data.zip |
| 90 |
# |
| 91 |
-test1: |
| 92 |
+test1: shptest |
| 93 |
@./stream1.sh > s1.out |
| 94 |
@if test "`diff s1.out stream1.out`" = '' ; then \ |
| 95 |
echo "******* Stream 1 Succeeded *********"; \ |
| 96 |
@@ -74,7 +74,7 @@ |
| 97 |
diff s1.out stream1.out; \ |
| 98 |
fi |
| 99 |
|
| 100 |
-test2: |
| 101 |
+test2: shptest |
| 102 |
@./stream2.sh > s2.out |
| 103 |
@if test "`diff s2.out stream2.out`" = '' ; then \ |
| 104 |
echo "******* Stream 2 Succeeded *********"; \ |
| 105 |
@@ -85,7 +85,7 @@ |
| 106 |
diff s2.out stream2.out; \ |
| 107 |
fi |
| 108 |
|
| 109 |
-test3: |
| 110 |
+test3: shptest |
| 111 |
@./makeshape.sh > s3.out |
| 112 |
@if test "`diff s3.out stream3.out`" = '' ; then \ |
| 113 |
echo "******* Stream 3 Succeeded *********"; \ |
| 114 |
@@ -97,9 +97,7 @@ |
| 115 |
fi |
| 116 |
|
| 117 |
|
| 118 |
-lib: libshp.a |
| 119 |
- |
| 120 |
-libshp.a: $(LIBOBJ) |
| 121 |
+lib: $(LIBOBJ) |
| 122 |
ar r libshp.a $(LIBOBJ) |
| 123 |
|
| 124 |
lib_install: libshp.a |
Archives