Mercurial > mxe-octave

changeset 3627:9e2ff7672dc2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
libgeotiff: fix shared lib build * src/libgeotiff-1-noundefined.patch: new file. * dist-files.mk added libgeotiff-1-noundefined.patch. * src/libgeotiff.mk: use --with-XXX config opts
author John Donoghue <john.donoghue@ieee.org>
date Sat, 28 Jun 2014 17:41:59 -0400
parents 3959e3b1fcbf
children a98f4ebb8a3c
files dist-files.mk src/libgeotiff-1-noundefined.patch src/libgeotiff.mk
diffstat 3 files changed, 43 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Jun 28 09:50:22 2014 -0400
+++ b/dist-files.mk	Sat Jun 28 17:41:59 2014 -0400
@@ -207,6 +207,7 @@
   libgda.mk \
   libgdamm.mk \
   libgee.mk \
+  libgeotiff-1-noundefined.patch \
   libgeotiff.mk \
   libglade.mk \
   libgnurx-1-build-static-lib.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgeotiff-1-noundefined.patch	Sat Jun 28 17:41:59 2014 -0400
@@ -0,0 +1,34 @@
+diff -ur libgeotiff-1.4.0.orig/libxtiff/Makefile.am libgeotiff-1.4.0/libxtiff/Makefile.am
+--- libgeotiff-1.4.0.orig/libxtiff/Makefile.am	2014-06-28 09:56:02.000000000 -0400
++++ libgeotiff-1.4.0/libxtiff/Makefile.am	2014-06-28 11:57:04.000000000 -0400
+@@ -7,5 +7,5 @@
+ AM_CFLAGS = -I../ $(TIFF_CFLAGS) 
+ 
+ libxtiff_la_SOURCES = xtiff.c
+-
++libxtiff_la_LIBADD = -ltiff
+ noinst_LTLIBRARIES = libxtiff.la
+diff -ur libgeotiff-1.4.0.orig/Makefile.am libgeotiff-1.4.0/Makefile.am
+--- libgeotiff-1.4.0.orig/Makefile.am	2014-06-28 09:56:02.000000000 -0400
++++ libgeotiff-1.4.0/Makefile.am	2014-06-28 09:56:53.000000000 -0400
+@@ -108,7 +108,7 @@
+                              csv/unit_of_measure.c 
+ endif
+ 
+-libgeotiff_la_LDFLAGS = -version-info 3:0:1
++libgeotiff_la_LDFLAGS = -version-info 3:0:1 --no-undefined
+ 
+ libgeotiff_la_LIBADD = libxtiff/libxtiff.la
+ 
+diff -ur libgeotiff-1.4.0.orig/Makefile.in libgeotiff-1.4.0/Makefile.in
+--- libgeotiff-1.4.0.orig/Makefile.in	2014-06-28 09:56:02.000000000 -0400
++++ libgeotiff-1.4.0/Makefile.in	2014-06-28 17:37:48.000000000 -0400
+@@ -448,7 +448,7 @@
+ 	geo_get.c geo_names.c geo_new.c geo_normalize.c geo_print.c \
+ 	geo_set.c geo_simpletags.c geo_tiffp.c geo_trans.c geo_write.c \
+ 	geo_strtod.c geotiff_proj4.c $(am__append_1)
+-libgeotiff_la_LDFLAGS = -version-info 3:0:1
++libgeotiff_la_LDFLAGS = -version-info 3:0:1 -no-undefined
+ libgeotiff_la_LIBADD = libxtiff/libxtiff.la
+ lib_LTLIBRARIES = libgeotiff.la
+ EXTRA_DIST = makefile.vc \
--- a/src/libgeotiff.mk	Sat Jun 28 09:50:22 2014 -0400
+++ b/src/libgeotiff.mk	Sat Jun 28 17:41:59 2014 -0400
@@ -24,7 +24,13 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
-        LIBS="`'$(MXE_PKG_CONFIG)' --libs libtiff-4` -ljpeg -lz"
-    $(MAKE) -C '$(1)' -j 1 all install EXEEXT=.remove-me MAKE='$(MAKE)'
+        --with-zlib=$(HOST_PREFIX) \
+        --with-jpeg=$(HOST_PREFIX) \
+        --with-libtiff=$(HOST_PREFIX) \
+        --with-proj=$(HOST_PREFIX) 
+
+    $(MAKE) -C '$(1)' -j $(JOBS) 
+    $(MAKE) -C '$(1)' -j 1 install
+    #$(MAKE) -j 1 install EXEEXT=.remove-me MAKE='$(MAKE)'
     rm -fv '$(HOST_BINDIR)'/*.remove-me
 endef