diff options
| -rw-r--r-- | src/libgsasl-1-fixes.patch | 2 | ||||
| -rw-r--r-- | src/libgsasl.mk | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/libgsasl-1-fixes.patch b/src/libgsasl-1-fixes.patch index 6695b55..561684c 100644 --- a/src/libgsasl-1-fixes.patch +++ b/src/libgsasl-1-fixes.patch @@ -30,7 +30,7 @@ index b0c477d..d8d8ccc 100644 Version: @VERSION@ Libs: -L${libdir} -lgsasl Libs.private: @LTLIBGCRYPT@ @LTLIBIDN@ @LTLIBNTLM@ -+Requires.private: nettle ++Requires: nettle Cflags: -I${includedir} -- 1.7.7 diff --git a/src/libgsasl.mk b/src/libgsasl.mk index 96097a8..feef05d 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -19,15 +19,13 @@ endef define $(PKG)_BUILD cd '$(1)' && touch src/libgsasl-7.def && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-nls \ --with-libgcrypt \ --with-libiconv-prefix='$(PREFIX)/$(TARGET)' \ --with-libidn-prefix='$(PREFIX)/$(TARGET)' \ - --with-libntlm-prefix='$(PREFIX)/$(TARGET)' + --with-libntlm-prefix='$(PREFIX)/$(TARGET)' \ + LIBS="`$(TARGET)-pkg-config --libs-only-l nettle`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ @@ -35,5 +33,3 @@ define $(PKG)_BUILD '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libgsasl.exe' \ `'$(TARGET)-pkg-config' libgsasl --cflags --libs` endef - -$(PKG)_BUILD_SHARED = |