Mercurial > mxe-octave

changeset 2316:9e4b6948a574

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
project proj: install missing header --- src/proj-1-fixes.patch | 27 +++++++++++++++++++++++++++ src/proj.mk | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 src/proj-1-fixes.patch
author Mark Brand <mabrand@mabrand.nl>
date Sat, 24 Mar 2012 20:29:38 +0100
parents 2b5ea5239144
children 2adaf7570f42
files src/proj-1-fixes.patch src/proj.mk
diffstat 2 files changed, 29 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/proj-1-fixes.patch	Sat Mar 24 20:29:38 2012 +0100
@@ -0,0 +1,27 @@
+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
+
+
+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	Sun Mar 25 03:48:54 2012 +1100
+++ b/src/proj.mk	Sat Mar 24 20:29:38 2012 +0100
@@ -20,6 +20,8 @@
 endef
 
 define $(PKG)_BUILD
+    cd '$(1)' && autoconf
+    cd '$(1)' && automake
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \