diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-11-24 10:47:42 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-11-24 10:47:42 (GMT) |
| commit | b26ebd37dde00872e294e4df2f948fafbc291aad (patch) | |
| tree | 6b1fe17b5ad23eb6ae5cf43ac604638a09f3eeed /src/gnutls.mk | |
| parent | 32c98d3260ce5f7c34156da0d559ebe389b61718 (diff) | |
| download | mxe-b26ebd37dde00872e294e4df2f948fafbc291aad.zip mxe-b26ebd37dde00872e294e4df2f948fafbc291aad.tar.gz mxe-b26ebd37dde00872e294e4df2f948fafbc291aad.tar.bz2 | |
package gnutls: clean up
-Replace echo and sed hacks
-gai_strerror test seems to work now without hack.
-Disable crywrap for Windows with configure logic.
-Disable doc and tests targets with patch.
-Improve handling of LIBS and .pc file
-zlib is already in GNUTLS_REQUIRES_PRIVATE
-Use LIBS to introduce -lws32_2 into Libs.private
Diffstat (limited to 'src/gnutls.mk')
| -rw-r--r-- | src/gnutls.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gnutls.mk b/src/gnutls.mk index ac6d6f6..2d4b53f 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -10,7 +10,7 @@ $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ $(PKG)_URL := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib nettle +$(PKG)_DEPS := gcc nettle zlib define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \ @@ -22,11 +22,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - echo '/* DEACTIVATED */' > '$(1)/gl/gai_strerror.c' - $(SED) -i 's/^\(SUBDIRS.*\) tests/\1/;' '$(1)/Makefile.in' - $(SED) -i 's/^\(SUBDIRS.*\) doc/\1/;' '$(1)/Makefile.in' - $(SED) -i 's/ crywrap//;' '$(1)/src/Makefile.in' - $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.in' + $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' + cd '$(1)' && autoconf + cd '$(1)' && automake cd '$(1)' && ./configure \ --host='$(TARGET)' \ --enable-static \ @@ -39,7 +37,7 @@ define $(PKG)_BUILD --without-p11-kit \ --disable-silent-rules \ CPPFLAGS='-DWINVER=0x0501' \ - LIBS='-lz -lws2_32' \ + LIBS='-lws2_32' \ ac_cv_prog_AR='$(TARGET)-ar' $(MAKE) -C '$(1)' -j '$(JOBS)' install |