diff options
| -rw-r--r-- | src/proj-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/proj.mk | 5 |
2 files changed, 2 insertions, 32 deletions
diff --git a/src/proj-1-fixes.patch b/src/proj-1-fixes.patch deleted file mode 100644 index ceda4fc..0000000 --- a/src/proj-1-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From e6d8b644652d5671a77a7eb3935edb1bc80bf0e3 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Sat, 24 Mar 2012 20:16:15 +0100 -Subject: [PATCH] install projects.h - -Cherry-picked from -http://lists.maptools.org/pipermail/proj/2012-March/006200.html - -diff --git a/src/Makefile.am b/src/Makefile.am -index 621b0b4..715d49a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -4,7 +4,7 @@ EXTRA_PROGRAMS = multistresstest - INCLUDES = -DPROJ_LIB=\"$(pkgdatadir)\" \ - -DMUTEX_@MUTEX_SETTING@ @JNI_INCLUDE@ - --include_HEADERS = proj_api.h org_proj4_Projections.h -+include_HEADERS = proj_api.h org_proj4_Projections.h projects.h - - EXTRA_DIST = makefile.vc proj.def - --- -1.7.9.2 - diff --git a/src/proj.mk b/src/proj.mk index 223bd3c..4567811 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -20,14 +20,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && autoconf - cd '$(1)' && aclocal - cd '$(1)' && automake cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ --with-mutex $(MAKE) -C '$(1)' -j '$(JOBS)' + # remove header which is not installed since 4.8.0 + rm -f '$(PREFIX)/$(TARGET)'/include/projects.h $(MAKE) -C '$(1)' -j 1 install endef |