diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-11-29 00:15:43 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-11-29 00:15:43 (GMT) |
| commit | 6414eebdaa8668a23628d2b5431b862d55e74da2 (patch) | |
| tree | 431fd219d810e40990fd4ebe1652e8850bcc4306 | |
| parent | 4dab36fa2fe229658c308e924debfcc9e7793284 (diff) | |
| download | mxe-6414eebdaa8668a23628d2b5431b862d55e74da2.zip mxe-6414eebdaa8668a23628d2b5431b862d55e74da2.tar.gz mxe-6414eebdaa8668a23628d2b5431b862d55e74da2.tar.bz2 | |
fix build scripts of packages: curl gnutls xerces
| -rw-r--r-- | src/curl.mk | 4 | ||||
| -rw-r--r-- | src/gnutls.mk | 5 | ||||
| -rw-r--r-- | src/xerces-1-fix-pkgconfig.patch | 15 | ||||
| -rw-r--r-- | src/xerces.mk | 2 |
4 files changed, 21 insertions, 5 deletions
diff --git a/src/curl.mk b/src/curl.mk index 2e86597..a0285ec 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -25,8 +25,8 @@ define $(PKG)_BUILD --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 diff --git a/src/gnutls.mk b/src/gnutls.mk index 9bb74c3..7cb40b2 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -11,7 +11,7 @@ $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 $(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 @@ define $(PKG)_BUILD --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 diff --git a/src/xerces-1-fix-pkgconfig.patch b/src/xerces-1-fix-pkgconfig.patch new file mode 100644 index 0000000..db07d02 --- /dev/null +++ b/src/xerces-1-fix-pkgconfig.patch @@ -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} diff --git a/src/xerces.mk b/src/xerces.mk index a21dc74..eda448e 100644 --- a/src/xerces.mk +++ b/src/xerces.mk @@ -51,5 +51,5 @@ define $(PKG)_BUILD '$(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 |