rpms
/
shapelib
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix undefined symbols

Browse Source
epel9
Lucian Langa 15 years ago
parent 676ebe27e0
commit 5ead7d0a33
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File

26
shapelib-1.2.10-Makefile.patch
Unescape View File

@ -1,10 +1,10 @@
diff -Naur shapelib-1.2.10/Makefile shapelib-1.2.10-mod/Makefile
--- shapelib-1.2.10/Makefile 2007-12-13 22:27:13.000000000 +0200
+++ shapelib-1.2.10-mod/Makefile 2010-02-16 09:31:24.000000000 +0200
@@ -7,6 +7,14 @@
+++ shapelib-1.2.10-mod/Makefile 2010-02-19 09:59:18.000000000 +0200
@@ -6,6 +6,13 @@
INSTALL = /usr/bin/install
LD = /usr/bin/ld
#CC = g++
+bindir = /usr/local/bin
+libdir = /usr/local/lib
+includedir = /usr/local/include
@ -12,11 +12,10 @@ diff -Naur shapelib-1.2.10/Makefile shapelib-1.2.10-mod/Makefile
+CC = gcc
+CFLAGS = -g
+
+
default: all
all: shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump shptest
@@ -103,25 +111,26 @@
@@ -103,29 +110,34 @@
# The following is contributed by Jan-Oliver Wagner, and should allow for
# creating shared libraries on most platforms with gcc, and libtool installed.
@ -31,7 +30,6 @@ diff -Naur shapelib-1.2.10/Makefile shapelib-1.2.10-mod/Makefile
+ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c
+ $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
+ $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -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
+ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shptree.c
@ -50,11 +48,21 @@ diff -Naur shapelib-1.2.10/Makefile shapelib-1.2.10-mod/Makefile
+ $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -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
+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) $(LINKOPTS) -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo
+ /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. $(CFLAGS) $(LINKOPTS) -c safileio.c
+ rm -f .libs/safileio.lo
+ $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC safileio.c -o .libs/safileio.lo
+ $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c safileio.c -o safileio.o >/dev/null 2>&1
+ mv -f .libs/safileio.lo safileio.lo
+ /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) $(LINKOPTS) -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo safileio.lo
rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
rm -fr .libs/libshp.lax
mkdir .libs/libshp.lax
@@ -136,15 +145,21 @@
- $(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc
+ $(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo safileio.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)
@@ -136,15 +148,21 @@
lib_install:
cp .libs/libshp.la .libs/libshp.lai

4
shapelib-1.2.10-buildid.patch
Unescape View File

@ -13,8 +13,8 @@ diff -Naur shapelib-1.2.10/Makefile shapelib-1.2.10-mod/Makefile
rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
rm -fr .libs/libshp.lax
mkdir .libs/libshp.lax
- $(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc
+ $(LD) $(LDFLAGS) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc
- $(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo safileio.lo -lc
+ $(LD) $(LDFLAGS) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo safileio.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)

5
shapelib.spec
Unescape View File

@ -5,7 +5,7 @@
Summary: API in "C" for Shapefile handling
Name: shapelib
Version: 1.2.10
Release: 1.%{snapshot}%{?dist}
Release: 2.%{snapshot}%{?dist}
# No version of the LGPL is given.
License: LGPLv2+ or MIT
URL: http://shapelib.maptools.org/
@ -81,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so
%changelog
* Fri Feb 19 2010 Lucian Langa <cooly@gnome.eu.org> - 1.2.10-2.20100216cvs
- update patch0-3 fix undefined symbols
* Tue Feb 16 2010 Lucian Langa <cooly@gnome.eu.org> - 1.2.10-1.20100216cvs
- revert to latest cvs snapshot

Write Preview
Loading…
Cancel
Save