Mercurial > mxe-octave
changeset 4033:6a4b0052211f
libgeotiff: call autoreconf on build files, fix typo in patch
* src/libgeitiff.mk: call autoreconf on build files
* src/libgeotiff-1-noundefined.patch: update paich, fix typo in -no-undefined
| author | John Donoghue |
|---|---|
| date | Thu, 24 Sep 2015 09:46:12 -0400 |
| parents | 36fe0b462682 |
| children | 5f0460a37b3d |
| files | src/libgeotiff-1-noundefined.patch src/libgeotiff.mk |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libgeotiff-1-noundefined.patch Wed Sep 23 07:41:42 2015 -0400 +++ b/src/libgeotiff-1-noundefined.patch Thu Sep 24 09:46:12 2015 -0400 @@ -16,7 +16,7 @@ endif -libgeotiff_la_LDFLAGS = -version-info 3:0:1 -+libgeotiff_la_LDFLAGS = -version-info 3:0:1 --no-undefined ++libgeotiff_la_LDFLAGS = -version-info 3:0:1 -no-undefined libgeotiff_la_LIBADD = libxtiff/libxtiff.la @@ -32,3 +32,15 @@ libgeotiff_la_LIBADD = libxtiff/libxtiff.la lib_LTLIBRARIES = libgeotiff.la EXTRA_DIST = makefile.vc \ +diff -burN libgeotiff-1.4.0.orig/configure.ac libgeotiff-1.4.0/configure.ac +--- libgeotiff-1.4.0.orig/configure.ac 2015-06-21 03:50:03.341076086 +0200 ++++ libgeotiff-1.4.0/configure.ac 2015-06-21 03:50:39.741125191 +0200 +@@ -280,7 +280,7 @@ + PROJ_INC=-I$PROJ_INC + + AC_SUBST(PROJ_INC,$PROJ_INC) +- AC_DEFINE(HAVE_PROJECTS_H) ++ AC_DEFINE([HAVE_PROJECTS_H], [], [Description]) + AC_DEFINE(HAVE_LIBPROJ) + AC_SUBST([HAVE_LIBPROJ]) + PROJ_CONFIG="yes"
--- a/src/libgeotiff.mk Wed Sep 23 07:41:42 2015 -0400 +++ b/src/libgeotiff.mk Thu Sep 24 09:46:12 2015 -0400 @@ -20,6 +20,7 @@ define $(PKG)_BUILD $(SED) -i 's,/usr/local,@prefix@,' '$(1)/bin/Makefile.in' touch '$(1)/configure' + cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ $(ENABLE_SHARED_OR_STATIC) \ @@ -31,6 +32,4 @@ $(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