libxml 2.9.4, gdal 1.11.5

PostgresApp · Aug 16, 2016 · 48c2a7a · 48c2a7a
1 parent e90ef75
commit 48c2a7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Postgres.xcodeproj/project.pbxproj b/Postgres.xcodeproj/project.pbxproj
@@ -651,7 +651,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
 				POSTGRESAPP_BUILD_VERSION = "$(POSTGRES_VERSION).$(POSTGRESAPP_MINOR_VERSION)";
-				POSTGRESAPP_MINOR_VERSION = 0;
+				POSTGRESAPP_MINOR_VERSION = 1;
 				POSTGRES_MAJOR_VERSION = 9.5;
 				POSTGRES_VERSION = 9.5.4;
 				SDKROOT = macosx;
@@ -679,7 +679,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				POSTGRESAPP_BUILD_VERSION = "$(POSTGRES_VERSION).$(POSTGRESAPP_MINOR_VERSION)";
-				POSTGRESAPP_MINOR_VERSION = 0;
+				POSTGRESAPP_MINOR_VERSION = 1;
 				POSTGRES_MAJOR_VERSION = 9.5;
 				POSTGRES_VERSION = 9.5.4;
 				SDKROOT = macosx;

diff --git a/src/makefile b/src/makefile
@@ -8,8 +8,7 @@ POSTGRES_VERSION=9.5.4
 POSTGRES_MAJOR_VERSION=9.5
 
 # http://trac.osgeo.org/gdal/wiki/DownloadSource
-# (version 1.11.5 fails to link with iconv)
-GDAL_VERSION=1.11.4
+GDAL_VERSION=1.11.5
 
 # http://trac.osgeo.org/geos/
 GEOS_VERSION=3.5.0
@@ -21,7 +20,7 @@ LIBEDIT_VERSION=20130611-3.1
 LIBJASPER_VERSION=1.900.1
 
 # http://xmlsoft.org/news.html
-LIBXML2_VERSION=2.9.3
+LIBXML2_VERSION=2.9.4
 
 # https://www.openssl.org
 OPENSSL_VERSION=1.0.1t
@@ -127,7 +126,7 @@ $(PREFIX)/lib/libxml2.dylib: libxml2-${LIBXML2_VERSION}/Makefile
 	touch $(PREFIX)/lib/libxml2.dylib
 
 libxml2-${LIBXML2_VERSION}/Makefile: libxml2-${LIBXML2_VERSION}/configure
-	cd libxml2-${LIBXML2_VERSION} && ./configure --prefix="$(PREFIX)" --disable-dependency-tracking
+	cd libxml2-${LIBXML2_VERSION} && export PATH="$(PREFIX)/bin:/bin:/usr/bin" && ./configure --prefix="$(PREFIX)" --disable-dependency-tracking
 
 libxml2-${LIBXML2_VERSION}/configure: libxml2-${LIBXML2_VERSION}.tar.gz
 	$(TAR) libxml2-${LIBXML2_VERSION}.tar.gz