Mercurial > mxe-octave
view src/libgeotiff-1-noundefined.patch @ 4467:b7d6a53fa46c
gcc: update to 7.1 with tools
* src/build-gcc.mk: update version 7.1.0
* src/cloog.mk: update 0.18.4
* src/gmp.mk: update 6.1.2
* src/isl.mk: update 0.16.1, add no-undefined flag
* src/mpfr.mk: update 3.1.6
* src/native-gcc.mk: update 7.1.0
* src/isl-1-fixes.patch: removed file
* dist-files.mk: remove reference to patch files, add mingw-w64 patch
* src/build-gcc-1-mingw-float.patch: removed patch
* src/native-gcc-1-mingw-float.patch: removed patch
* src/build-gcc-2-intrinsics.patch: removed patch
* src/native-gcc-2-intrinsics.patch: removed patch
* src/mingw-w64.mk: update to 5.0.2
* src/gcc-1-mingw-float.patch: remove patch
* src/gcc-2-darwin-no-pie.patch: remove patch
* src/mingw-w64-2-pthreads.patch: new file
* src/pthreads.mk: apply mingw patches to mingw sources before running configure
author | John D |
---|---|
date | Mon, 31 Jul 2017 16:53:21 -0400 |
parents | 03a2432afc32 |
children | 8212b14b3233 |
line wrap: on
line source
diff -ur libgeotiff-1.4.2.orig/configure.ac libgeotiff-1.4.2/configure.ac --- libgeotiff-1.4.2.orig/configure.ac 2016-12-20 07:54:57.947571494 -0500 +++ libgeotiff-1.4.2/configure.ac 2016-12-20 08:04:22.867573204 -0500 @@ -281,7 +281,7 @@ PROJ_INC=-I$PROJ_INC AC_SUBST(PROJ_INC,$PROJ_INC) - AC_DEFINE(HAVE_PROJECTS_H) + AC_DEFINE([HAVE_PROJECTS_H],[],[D]) AC_DEFINE(HAVE_LIBPROJ) AC_SUBST([HAVE_LIBPROJ]) PROJ_CONFIG="yes" @@ -317,7 +317,7 @@ AM_CONDITIONAL([CSV_IS_CONFIG], [test ! x$CSV_CONFIG = xno]) -AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE(GEO_NORMALIZE_DISABLE_TOWGS84)) +AC_ARG_ENABLE(towgs84, [ --disable-towgs84 Disable WGS84 parameters for binary compatibility with pre-1.4.1], AC_DEFINE([GEO_NORMALIZE_DISABLE_TOWGS84],[],[D])) dnl ######################################################################### dnl Doxygen settings diff -ur libgeotiff-1.4.2.orig/libxtiff/Makefile.am libgeotiff-1.4.2/libxtiff/Makefile.am --- libgeotiff-1.4.2.orig/libxtiff/Makefile.am 2016-12-20 07:54:57.946488133 -0500 +++ libgeotiff-1.4.2/libxtiff/Makefile.am 2016-12-20 07:55:59.005822766 -0500 @@ -7,5 +7,6 @@ AM_CFLAGS = -I../ $(TIFF_CFLAGS) libxtiff_la_SOURCES = xtiff.c +libxtiff_la_LIBADD = -ltiff noinst_LTLIBRARIES = libxtiff.la diff -ur libgeotiff-1.4.2.orig/Makefile.am libgeotiff-1.4.2/Makefile.am --- libgeotiff-1.4.2.orig/Makefile.am 2016-12-20 07:54:57.948654856 -0500 +++ libgeotiff-1.4.2/Makefile.am 2016-12-20 07:57:15.239801217 -0500 @@ -110,7 +110,7 @@ csv/unit_of_measure.c endif -libgeotiff_la_LDFLAGS = -version-info 3:2:1 +libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined libgeotiff_la_LIBADD = libxtiff/libxtiff.la diff -ur libgeotiff-1.4.2.orig/Makefile.in libgeotiff-1.4.2/Makefile.in --- libgeotiff-1.4.2.orig/Makefile.in 2016-12-20 07:54:57.931321073 -0500 +++ libgeotiff-1.4.2/Makefile.in 2016-12-20 07:57:58.276334784 -0500 @@ -567,7 +567,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_3) -libgeotiff_la_LDFLAGS = -version-info 3:2:1 +libgeotiff_la_LDFLAGS = -version-info 3:2:1 -no-undefined libgeotiff_la_LIBADD = libxtiff/libxtiff.la lib_LTLIBRARIES = libgeotiff.la EXTRA_DIST = autogen.sh \