From: "Sebastien Fabbro (bicatali)" <bicatali@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/shapelib/files: shapelib-1.3.0-respect-user.patch
Date: Thu, 2 Aug 2012 23:24:26 +0000 (UTC) [thread overview]
Message-ID: <20120802232426.B0ABB2004C@flycatcher.gentoo.org> (raw)
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
next reply other threads:[~2012-08-02 23:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-02 23:24 Sebastien Fabbro (bicatali) [this message]
-- strict thread matches above, loose matches on Subject: below --
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)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120802232426.B0ABB2004C@flycatcher.gentoo.org \
--to=bicatali@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox