Mercurial > mxe-octave

view src/libgeotiff-1-noundefined.patch @ 3721:933b99febcf1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expand options to support 3 possible sources of octave * configure.ac: modify --enable-stable rule to --enable-octave=source (stable,alpha,default) * Makefile.am: modify OCTAVE_TARGET based on octave build value set in configure. * index.html: added master-octave information. * src/default-octave.mk: new file. * src/default-octave-1-docinstall.patch * dist-files.mk: add default-octave-1-docinstall.patch default-octave.mk * binary-dist-rules.mk: use OCTAVE_TARGET to decide on tarball/installer name
author John Donoghue <john.donoghue@ieee.org>
date Sun, 19 Oct 2014 22:58:20 -0400
parents 9e2ff7672dc2
children 6a4b0052211f
line wrap: on
line source

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 \