summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Arnold <nerdboy@gentoo.org>2010-04-17 17:14:03 +0000
committerSteve Arnold <nerdboy@gentoo.org>2010-04-17 17:14:03 +0000
commit4e75ac9f1b2e8b54e7c58be12b2c37860e495092 (patch)
treea5350646437f8aabb375c887941ab606ecdef0bb /sci-libs/libgeotiff/files
parentWorks only with python-2 (#315331). Thanks to arfrever for the patch and ohno... (diff)
downloadgentoo-2-4e75ac9f1b2e8b54e7c58be12b2c37860e495092.tar.gz
gentoo-2-4e75ac9f1b2e8b54e7c58be12b2c37860e495092.tar.bz2
gentoo-2-4e75ac9f1b2e8b54e7c58be12b2c37860e495092.zip
Update for latest stable 1.2.x release; closes bug 307639.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/libgeotiff/files')
-rw-r--r--sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch15
-rw-r--r--sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch10
2 files changed, 25 insertions, 0 deletions
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch
new file mode 100644
index 000000000000..eaa06da1a2bb
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-listgeo-link-hack.patch
@@ -0,0 +1,15 @@
+--- bin/Makefile.in.orig 2009-10-10 12:04:15.972291516 -0700
++++ bin/Makefile.in 2009-10-10 12:07:34.459886566 -0700
+@@ -49,10 +49,10 @@
+ ${CC} ${COPTS} makegeo.o -L${libdir} ${LIBS} -o $@
+
+ geotifcp$(EXEEXT): geotifcp.o ${GEOTIFFDIR}/libgeotiff.a
+- ${CC} ${COPTS} geotifcp.o -L${libdir} ${LIBS} -o $@
++ ${CC} ${COPTS} geotifcp.o -L${libdir} ../libgeotiff.a ${LIBS} -o $@
+
+ listgeo$(EXEEXT): listgeo.o ${GEOTIFFDIR}/libgeotiff.a
+- ${CC} ${COPTS} listgeo.o -L${libdir} ${LIBS} -o $@
++ ${CC} ${COPTS} listgeo.o -L${libdir} ../libgeotiff.a ${LIBS} -o $@
+
+ csv2html$(EXEEXT): csv2html.o ${GEOTIFFDIR}/libgeotiff.a
+ ${CC} ${COPTS} csv2html.o -L${libdir} ${LIBS} -o $@
diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch
new file mode 100644
index 000000000000..719a3e0b5384
--- /dev/null
+++ b/sci-libs/libgeotiff/files/libgeotiff-1.2.5-make.patch
@@ -0,0 +1,10 @@
+--- Makefile.in.orig 2009-10-10 10:32:26.665288828 -0700
++++ Makefile.in 2009-10-10 10:35:36.098484182 -0700
+@@ -104,6 +104,7 @@
+ ${LD_SHARED} ${OBJS} ${LIBS} -o $(GEOTIFF_SO)
+ rm -f libgeotiff.$(SO_EXT)
+ ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT)
++ ${LN} $(GEOTIFF_SO) libgeotiff.$(SO_EXT).$(VERSION_MAJOR).$(VERSION_MINOR)
+
+ Progs: $(GEOTIFF_SO)
+ ${CD} ${BIN};\