diff options
Diffstat (limited to 'src/gsoap.mk')
| -rw-r--r-- | src/gsoap.mk | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/gsoap.mk b/src/gsoap.mk index a0d46c2..c8a89ef 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -4,13 +4,13 @@ # gSOAP PKG := gsoap $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.2 -$(PKG)_CHECKSUM := 199b7d4cf0b6a5bf81a2198e39f03c092ffc05a7 +$(PKG)_VERSION := 2.8.6 +$(PKG)_CHECKSUM := ec0d3f06d0afbee481a3afd7f8828704404068c3 $(PKG)_SUBDIR := gsoap-$(call SHORT_PKG_VERSION,$(PKG)) $(PKG)_FILE := gsoap_$($(PKG)_VERSION).zip $(PKG)_WEBSITE := http://gsoap2.sourceforge.net/ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/gsoap2/gSOAP/$($(PKG)_FILE) -$(PKG)_DEPS := gcc gnutls +$(PKG)_DEPS := gcc gnutls libgcrypt libntlm define $(PKG)_UPDATE wget -q -O- 'http://sourceforge.net/projects/gsoap2/files/gSOAP/' | \ @@ -22,8 +22,9 @@ define $(PKG)_BUILD # Native build to get tools wsdl2h and soapcpp2 cd '$(1)' && ./configure - # Parallel bulds can fail - $(MAKE) -C '$(1)'/gsoap -j 1 + # Work around parallel build problem + $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h + $(MAKE) -C '$(1)'/gsoap -j '$(JOBS)' # Install the native tools manually $(INSTALL) -m755 '$(1)'/gsoap/wsdl/wsdl2h '$(PREFIX)/bin/$(TARGET)-wsdl2h' @@ -31,8 +32,8 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' clean - # wine confuses the cross-compiling detection, so set it explicitly - $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' + # fix hard-coded gnutls dependencies + $(SED) -i "s/-lgnutls/`'$(TARGET)-pkg-config' --libs-only-l gnutls`/g;" '$(1)/configure' # Build for mingw. Static by default. # Prevent undefined reference to _rpl_malloc. @@ -40,15 +41,18 @@ define $(PKG)_BUILD cd '$(1)' && ac_cv_func_malloc_0_nonnull=yes ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --host='$(TARGET)' \ - --enable-gnutls + --build="`config.guess`" \ + --enable-gnutls \ + CPPFLAGS='-DWITH_NTLM' # Building for mingw requires native soapcpp2 - ln -s '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)'/gsoap/src/soapcpp2 + ln -sf '$(PREFIX)/bin/$(TARGET)-soapcpp2' '$(1)/gsoap/src/soapcpp2' - # Parallel bulds can fail - $(MAKE) -C '$(1)' -j 1 AR='$(TARGET)-ar' + # Work around parallel build problem + $(MAKE) -C '$(1)'/gsoap/src -j '$(JOBS)' soapcpp2_yacc.h AR='$(TARGET)-ar' + $(MAKE) -C '$(1)' -j '$(JOBS)' AR='$(TARGET)-ar' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)' -j '$(JOBS)' install # Apparently there is a tradition of compiling gsoap source files into applications. # Since we linked dom.cpp and dom.c into the libraries, this should not be necessary. # But we bend to tradition and install these sources into mingw-cross-env. |