The following commit has been merged in the master branch:
commit d7d142a1440b7439e6555c6d87123e094b5f96dd
Author: Arto Jantunen <vi...@debian.org>
Date: Tue May 8 14:31:08 2012 +0300
Add patch to dynamically link the shp* binaries to libshp
diff --git
a/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch
b/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch
new file mode 100644
index 0000000..a22ce20
--- /dev/null
+++ b/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch
@@ -0,0 +1,91 @@
+From: Arto Jantunen <vi...@debian.org>
+Date: Tue, 8 May 2012 14:19:20 +0300
+Subject: [PATCH] Dynamically link the shp* binaries to libshp
+
+---
+ Makefile | 55 ++++++++++++++++++++++++-------------------------------
+ 1 files changed, 24 insertions(+), 31 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f325e66..3e53d15 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,45 +6,36 @@ default: all
+
+ all: shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump shptest
+
+-shpopen.o: shpopen.c shapefil.h
+- $(CC) $(CFLAGS) -c shpopen.c
++shpcreate: shpcreate.c .libs/libshp.so
++ $(CC) $(CFLAGS) shpcreate.c $(LINKOPT) -o shpcreate .libs/libshp.so
+
+-shptree.o: shptree.c shapefil.h
+- $(CC) $(CFLAGS) -c shptree.c
++shpadd: shpadd.c .libs/libshp.so
++ $(CC) $(CFLAGS) shpadd.c $(LINKOPT) -o shpadd .libs/libshp.so
+
+-dbfopen.o: dbfopen.c shapefil.h
+- $(CC) $(CFLAGS) -c dbfopen.c
++shpdump: shpdump.c .libs/libshp.so
++ $(CC) $(CFLAGS) shpdump.c $(LINKOPT) -o shpdump .libs/libshp.so
+
+-shpcreate: shpcreate.c shpopen.o
+- $(CC) $(CFLAGS) shpcreate.c shpopen.o $(LINKOPT) -o shpcreate
++shprewind: shprewind.c .libs/libshp.so
++ $(CC) $(CFLAGS) shprewind.c $(LINKOPT) -o shprewind .libs/libshp.so
+
+-shpadd: shpadd.c shpopen.o
+- $(CC) $(CFLAGS) shpadd.c shpopen.o $(LINKOPT) -o shpadd
++dbfcreate: dbfcreate.c .libs/libshp.so
++ $(CC) $(CFLAGS) dbfcreate.c $(LINKOPT) -o dbfcreate .libs/libshp.so
+
+-shpdump: shpdump.c shpopen.o
+- $(CC) $(CFLAGS) shpdump.c shpopen.o $(LINKOPT) -o shpdump
++dbfadd: dbfadd.c .libs/libshp.so
++ $(CC) $(CFLAGS) dbfadd.c $(LINKOPT) -o dbfadd .libs/libshp.so
+
+-shprewind: shprewind.c shpopen.o
+- $(CC) $(CFLAGS) shprewind.c shpopen.o $(LINKOPT) -o shprewind
++dbfdump: dbfdump.c .libs/libshp.so
++ $(CC) $(CFLAGS) dbfdump.c $(LINKOPT) -o dbfdump .libs/libshp.so
+
+-dbfcreate: dbfcreate.c dbfopen.o
+- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o $(LINKOPT) -o dbfcreate
++shptest: shptest.c .libs/libshp.so
++ $(CC) $(CFLAGS) shptest.c $(LINKOPT) -o shptest .libs/libshp.so
+
+-dbfadd: dbfadd.c dbfopen.o
+- $(CC) $(CFLAGS) dbfadd.c dbfopen.o $(LINKOPT) -o dbfadd
++shputils: shputils.c .libs/libshp.so
++ $(CC) $(CFLAGS) shputils.c $(LINKOPT) -o shputils .libs/libshp.so
+
+-dbfdump: dbfdump.c dbfopen.o
+- $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump
+-
+-shptest: shptest.c shpopen.o
+- $(CC) $(CFLAGS) shptest.c shpopen.o $(LINKOPT) -o shptest
+-
+-shputils: shputils.c shpopen.o dbfopen.o
+- $(CC) $(CFLAGS) shputils.c shpopen.o dbfopen.o $(LINKOPT) -o shputils
+-
+-shptreedump: shptreedump.c shptree.o shpopen.o
+- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o $(LINKOPT) \
+- -o shptreedump
++shptreedump: shptreedump.c .libs/libshp.so
++ $(CC) $(CFLAGS) shptreedump.c $(LINKOPT) \
++ -o shptreedump .libs/libshp.so
+
+ clean:
+ rm -f *.o dbfdump dbfcreate dbfadd shpdump shpcreate shpadd shputils
+@@ -98,7 +89,9 @@ test3:
+ SHPLIB_VERSION=1.2.9
+ LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0),
sorry
+
+-lib:
++lib: .libs/libshp.so
++
++.libs/libshp.so:
+ libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shpopen.c
+ libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shptree.c
+ libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) -c dbfopen.c
+--
diff --git a/debian/patches/series b/debian/patches/series
index dad392a..c9d3362 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-Add-manpages.patch
0003-Thread-safety-fixes.patch
0004-Properly-use-libtool.patch
+0005-Dynamically-link-the-shp-binaries-to-libshp.patch
diff --git a/debian/rules b/debian/rules
index 9e58484..4dd8e75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,6 @@ override_dh_auto_test:
override_dh_auto_build:
mv shprewind shprewind.bak
dh_auto_build
- $(MAKE) lib
override_dh_auto_clean:
dh_auto_clean
--
Library for reading and writing ArcView Shapefiles
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
