Mercurial > mxe-octave

changeset 1454:e0507874b083

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build scripts of packages: curl gnutls xerces
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 29 Nov 2010 01:15:43 +0100
parents 050d1e842565
children 94cdbe762889
files src/curl.mk src/gnutls.mk src/xerces-1-fix-pkgconfig.patch src/xerces.mk
diffstat 4 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/curl.mk	Sun Nov 28 23:08:01 2010 +0100
+++ b/src/curl.mk	Mon Nov 29 01:15:43 2010 +0100
@@ -25,8 +25,8 @@
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-        --with-gnutls='$(PREFIX)/$(TARGET)' \
-        --with-libidn='$(PREFIX)/$(TARGET)' \
+        --with-gnutls \
+        --with-libidn \
         LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`"
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 endef
--- a/src/gnutls.mk	Sun Nov 28 23:08:01 2010 +0100
+++ b/src/gnutls.mk	Mon Nov 29 01:15:43 2010 +0100
@@ -11,7 +11,7 @@
 $(PKG)_WEBSITE  := http://www.gnu.org/software/gnutls/
 $(PKG)_URL      := ftp://ftp.gnu.org/pub/gnu/gnutls/$($(PKG)_FILE)
 $(PKG)_URL_2    := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc libgcrypt
+$(PKG)_DEPS     := gcc zlib libgcrypt
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \
@@ -32,6 +32,7 @@
         --with-included-opencdk \
         --with-included-libtasn1 \
         --with-included-libcfg \
-        --with-included-lzo
+        --with-included-lzo \
+        LIBS='-lz'
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA=
 endef
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/xerces-1-fix-pkgconfig.patch	Mon Nov 29 01:15:43 2010 +0100
@@ -0,0 +1,15 @@
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+This patch has been taken from:
+https://issues.apache.org/jira/browse/XERCESC-1951
+
+diff -r a3f28cf10046 xerces-c.pc.in
+--- a/xerces-c.pc.in	Mon Nov 29 00:46:50 2010 +0100
++++ b/xerces-c.pc.in	Mon Nov 29 00:58:47 2010 +0100
+@@ -7,4 +7,5 @@
+ Description: Validating XML parser library for C++
+ Version: @VERSION@
+ Libs: -L${libdir} -lxerces-c
++Libs.private: @CURL_LIBS@
+ Cflags: -I${includedir}
--- a/src/xerces.mk	Sun Nov 28 23:08:01 2010 +0100
+++ b/src/xerces.mk	Mon Nov 29 01:15:43 2010 +0100
@@ -51,5 +51,5 @@
     '$(TARGET)-g++' \
         -W -Wall -Werror -ansi -pedantic \
         '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-xerces.exe' \
-        -lxerces-c
+        `'$(TARGET)-pkg-config' xerces-c --cflags --libs`
 endef