Mercurial > mxe-octave
changeset 2326:d099cb3962a2
package proj: remove unnecessary patch
The real problem is projects.h which may be left behind from
proj 4.7 needs to be deleted.
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Mon, 26 Mar 2012 13:14:48 +0200 |
| parents | beb48dd597c9 |
| children | f308d384c9d2 |
| files | src/proj-1-fixes.patch src/proj.mk |
| diffstat | 2 files changed, 2 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/proj-1-fixes.patch Mon Mar 26 10:17:22 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -
--- a/src/proj.mk Mon Mar 26 10:17:22 2012 +0200 +++ b/src/proj.mk Mon Mar 26 13:14:48 2012 +0200 @@ -20,14 +20,13 @@ 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