* [gentoo-commits] gentoo-x86 commit in sci-libs/shapelib/files: shapelib-1.3.0-respect-user.patch
@ 2012-08-02 23:24 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2012-08-02 23:24 UTC (permalink / raw
To: gentoo-commits
bicatali 12/08/02 23:24:26
Added: shapelib-1.3.0-respect-user.patch
Log:
added a patch to respect user flags, fixed bad installation, define tests
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.1 sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch
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
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
Index: shapelib-1.3.0-respect-user.patch
===================================================================
--- Makefile.orig 2012-08-02 23:51:00.000000000 +0100
+++ Makefile 2012-08-03 00:19:37.000000000 +0100
@@ -1,6 +1,6 @@
-PREFIX = /usr/local
-CFLAGS = -g -Wall -fPIC
+PREFIX ?= /usr/localxs
+CFLAGS ?= -g -Wall -fPIC
#CFLAGS = -g -DUSE_CPL
#CC = g++
@@ -10,7 +10,7 @@
default: all
-all: $(SHPBIN) shptest lib
+all: $(SHPBIN) lib
shpopen.o: shpopen.c shapefil.h
$(CC) $(CFLAGS) -c shpopen.c
@@ -25,46 +25,46 @@
$(CC) $(CFLAGS) -c safileio.c
shpcreate: shpcreate.c shpopen.o safileio.o
- $(CC) $(CFLAGS) shpcreate.c shpopen.o safileio.o $(LINKOPT) -o shpcreate
+ $(CC) $(CFLAGS) $(LDFLAGS) shpcreate.c shpopen.o safileio.o -o shpcreate
shpadd: shpadd.c shpopen.o safileio.o
- $(CC) $(CFLAGS) shpadd.c shpopen.o safileio.o $(LINKOPT) -o shpadd
+ $(CC) $(CFLAGS) $(LDFLAGS) shpadd.c shpopen.o safileio.o -o shpadd
shpdump: shpdump.c shpopen.o safileio.o
- $(CC) $(CFLAGS) shpdump.c shpopen.o safileio.o $(LINKOPT) -o shpdump
+ $(CC) $(CFLAGS) $(LDFLAGS) shpdump.c shpopen.o safileio.o -o shpdump
shprewind: shprewind.c shpopen.o safileio.o
- $(CC) $(CFLAGS) shprewind.c shpopen.o safileio.o $(LINKOPT) -o shprewind
+ $(CC) $(CFLAGS) $(LDFLAGS) shprewind.c shpopen.o safileio.o -o shprewind
dbfcreate: dbfcreate.c dbfopen.o safileio.o
- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o safileio.o $(LINKOPT) -o dbfcreate
+ $(CC) $(CFLAGS) $(LDFLAGS) dbfcreate.c dbfopen.o safileio.o -o dbfcreate
dbfadd: dbfadd.c dbfopen.o safileio.o
- $(CC) $(CFLAGS) dbfadd.c dbfopen.o safileio.o $(LINKOPT) -o dbfadd
+ $(CC) $(CFLAGS) $(LDFLAGS) dbfadd.c dbfopen.o safileio.o -o dbfadd
dbfdump: dbfdump.c dbfopen.o safileio.o
- $(CC) $(CFLAGS) dbfdump.c dbfopen.o safileio.o $(LINKOPT) -o dbfdump
+ $(CC) $(CFLAGS) $(LDFLAGS) dbfdump.c dbfopen.o safileio.o -o dbfdump
shptest: shptest.c shpopen.o safileio.o
- $(CC) $(CFLAGS) shptest.c shpopen.o safileio.o $(LINKOPT) -o shptest
+ $(CC) $(CFLAGS) $(LDFLAGS) shptest.c shpopen.o safileio.o -o shptest
shputils: shputils.c shpopen.o safileio.o dbfopen.o
- $(CC) $(CFLAGS) shputils.c shpopen.o safileio.o dbfopen.o $(LINKOPT) -o shputils
+ $(CC) $(CFLAGS) $(LDFLAGS) shputils.c shpopen.o safileio.o dbfopen.o -o shputils
shptreedump: shptreedump.c shptree.o shpopen.o safileio.o
- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o safileio.o $(LINKOPT) \
+ $(CC) $(CFLAGS) $(LDFLAGS) shptreedump.c shptree.o shpopen.o safileio.o \
-o shptreedump
clean:
rm -f *.o shptest $(SHPBIN) libshp.a
-test: test2 test3
+test: shptest test2 test3
#
# Note this stream only works if example data is accessable.
# Fetch ftp://gdal.velocet.ca/pub/outgoing/shape_eg_data.zip
#
-test1:
+test1: shptest
@./stream1.sh > s1.out
@if test "`diff s1.out stream1.out`" = '' ; then \
echo "******* Stream 1 Succeeded *********"; \
@@ -74,7 +74,7 @@
diff s1.out stream1.out; \
fi
-test2:
+test2: shptest
@./stream2.sh > s2.out
@if test "`diff s2.out stream2.out`" = '' ; then \
echo "******* Stream 2 Succeeded *********"; \
@@ -85,7 +85,7 @@
diff s2.out stream2.out; \
fi
-test3:
+test3: shptest
@./makeshape.sh > s3.out
@if test "`diff s3.out stream3.out`" = '' ; then \
echo "******* Stream 3 Succeeded *********"; \
@@ -97,9 +97,7 @@
fi
-lib: libshp.a
-
-libshp.a: $(LIBOBJ)
+lib: $(LIBOBJ)
ar r libshp.a $(LIBOBJ)
lib_install: libshp.a
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/shapelib/files: shapelib-1.3.0-respect-user.patch
@ 2012-11-29 21:00 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2012-11-29 21:00 UTC (permalink / raw
To: gentoo-commits
jlec 12/11/29 21:00:14
Modified: shapelib-1.3.0-respect-user.patch
Log:
sci-libs/shapelib: Respect AR, #444548
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Revision Changes Path
1.2 sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch
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
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
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
Index: shapelib-1.3.0-respect-user.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/shapelib/files/shapelib-1.3.0-respect-user.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shapelib-1.3.0-respect-user.patch 2 Aug 2012 23:24:26 -0000 1.1
+++ shapelib-1.3.0-respect-user.patch 29 Nov 2012 21:00:14 -0000 1.2
@@ -1,6 +1,11 @@
---- Makefile.orig 2012-08-02 23:51:00.000000000 +0100
-+++ Makefile 2012-08-03 00:19:37.000000000 +0100
-@@ -1,6 +1,6 @@
+ Makefile | 41 ++++++++++++++++++++---------------------
+ 1 file changed, 20 insertions(+), 21 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 0c41d8a..4149412 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
-PREFIX = /usr/local
-CFLAGS = -g -Wall -fPIC
@@ -8,8 +13,11 @@
+CFLAGS ?= -g -Wall -fPIC
#CFLAGS = -g -DUSE_CPL
#CC = g++
++AR ?= ar
-@@ -10,7 +10,7 @@
+ LIBOBJ = shpopen.o dbfopen.o safileio.o shptree.o
+ SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \
+@@ -10,7 +11,7 @@ SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \
default: all
@@ -18,7 +26,7 @@
shpopen.o: shpopen.c shapefil.h
$(CC) $(CFLAGS) -c shpopen.c
-@@ -25,46 +25,46 @@
+@@ -25,46 +26,46 @@ safileio.o: safileio.c shapefil.h
$(CC) $(CFLAGS) -c safileio.c
shpcreate: shpcreate.c shpopen.o safileio.o
@@ -77,7 +85,7 @@
@./stream1.sh > s1.out
@if test "`diff s1.out stream1.out`" = '' ; then \
echo "******* Stream 1 Succeeded *********"; \
-@@ -74,7 +74,7 @@
+@@ -74,7 +75,7 @@ test1:
diff s1.out stream1.out; \
fi
@@ -86,7 +94,7 @@
@./stream2.sh > s2.out
@if test "`diff s2.out stream2.out`" = '' ; then \
echo "******* Stream 2 Succeeded *********"; \
-@@ -85,7 +85,7 @@
+@@ -85,7 +86,7 @@ test2:
diff s2.out stream2.out; \
fi
@@ -95,14 +103,16 @@
@./makeshape.sh > s3.out
@if test "`diff s3.out stream3.out`" = '' ; then \
echo "******* Stream 3 Succeeded *********"; \
-@@ -97,9 +97,7 @@
+@@ -97,10 +98,8 @@ test3:
fi
-lib: libshp.a
-
-libshp.a: $(LIBOBJ)
+- ar r libshp.a $(LIBOBJ)
+lib: $(LIBOBJ)
- ar r libshp.a $(LIBOBJ)
++ $(AR) r libshp.a $(LIBOBJ)
lib_install: libshp.a
+ cp libshp.a $(PREFIX)/lib
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-11-29 21:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 21:00 [gentoo-commits] gentoo-x86 commit in sci-libs/shapelib/files: shapelib-1.3.0-respect-user.patch Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2012-08-02 23:24 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox