The following commit has been merged in the master branch:
commit 622e67fb99814350f3d1207ca3264cfcfb9718de
Author: Arto Jantunen <vi...@debian.org>
Date: Tue May 8 12:39:43 2012 +0300
Update libtool patch to fully use system libtool without any kludges
(Closes: #316945)
Also obey CFLAGS when building the library.
diff --git a/debian/control b/debian/control
index 3026acf..89ba9ba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
Section: libs
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), libtool
Standards-Version: 3.9.3
Homepage: http://shapelib.maptools.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/shapelib.git
diff --git a/debian/patches/0004-Properly-use-libtool.patch
b/debian/patches/0004-Properly-use-libtool.patch
index 79d10a3..feaf2f0 100644
--- a/debian/patches/0004-Properly-use-libtool.patch
+++ b/debian/patches/0004-Properly-use-libtool.patch
@@ -7,17 +7,31 @@ library and replaces it with something hacks in together
almost right.
Bug-Debian: http://bugs.debian.org/497160
---
- Makefile | 24 ++++++++++++------------
- 1 files changed, 12 insertions(+), 12 deletions(-)
+ Makefile | 32 +++++---------------------------
+ 1 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/Makefile b/Makefile
-index 6d24091..3dd053e 100644
+index 6d24091..f325e66 100644
--- a/Makefile
+++ b/Makefile
-@@ -113,18 +113,18 @@ lib:
- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c
-o .libs/dbfopen.lo
- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o
>/dev/null 2>&1
- mv -f .libs/dbfopen.lo dbfopen.lo
+@@ -99,37 +99,15 @@ SHPLIB_VERSION=1.2.9
+ LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0),
sorry
+
+ lib:
+- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
-g -O2 -c shpopen.c
+- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c
-o .libs/shpopen.lo
+- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o
>/dev/null 2>&1
+- mv -f .libs/shpopen.lo shpopen.lo
+- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
-g -O2 -c shptree.c
+- rm -f .libs/shptree.lo
+- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c
-o .libs/shptree.lo
+- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o
>/dev/null 2>&1
+- mv -f .libs/shptree.lo shptree.lo
+- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\"
-DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include
-g -O2 -c dbfopen.c
+- rm -f .libs/dbfopen.lo
+- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c
-o .libs/dbfopen.lo
+- gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\"
-DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o
>/dev/null 2>&1
+- mv -f .libs/dbfopen.lo dbfopen.lo
- /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath
/usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
- rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
- rm -fr .libs/libshp.lax
@@ -30,19 +44,17 @@ index 6d24091..3dd053e 100644
- ranlib .libs/libshp.a
- rm -fr .libs/libshp.lax
- (cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la)
-+ /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/lib
-version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
-+# rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
-+# rm -fr .libs/libshp.lax
-+# mkdir .libs/libshp.lax
-+# /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)
shpopen.lo shptree.lo dbfopen.lo -lc
-+#
-+# (cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION)
libshp.so.1)
-+# (cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION)
libshp.so)
-+# ar cru .libs/libshp.a shpopen.o shptree.o dbfopen.o
-+# ranlib .libs/libshp.a
-+# rm -fr .libs/libshp.lax
-+# (cd .libs && rm -f libshp.la && ln -s ../libshp.la libshp.la)
++ 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
++ libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/lib
-version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
lib_install:
cp .libs/libshp.la .libs/libshp.lai
+ /bin/sh ./mkinstalldirs /usr/local/lib
+- /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la
/usr/local/lib/libshp.la
++ libtool --mode=install /usr/bin/install -c libshp.la
/usr/local/lib/libshp.la
+ /usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION)
/usr/local/lib/libshp.so.$(LIBSHP_VERSION)
+ (cd /usr/local/lib && rm -f libshp.so.1 && ln -s
libshp.so.$(LIBSHP_VERSION) libshp.so.1)
+ (cd /usr/local/lib && rm -f libshp.so && ln -s
libshp.so.$(LIBSHP_VERSION) libshp.so)
--
--
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
