Contribs: asdcplib, enable freedist and change Win32 flags

diff --git a/contrib/src/asdcplib/rules.mak b/contrib/src/asdcplib/rules.mak
index 45af1ba3a37a1abb8e3b0e93bdfdb4a38969bed3..9285e6fdfca4298e9b72b583234fec2097f52e86 100644 (file)
--- a/contrib/src/asdcplib/rules.mak
+++ b/contrib/src/asdcplib/rules.mak
@@ -16,9 +16,11 @@ $(TARBALLS)/asdcplib-$(ASDCPLIB_VERSION).tar.gz:
 
 asdcplib: asdcplib-$(ASDCPLIB_VERSION).tar.gz .sum-asdcplib
        $(UNPACK)
+       $(APPLY) $(SRC)/asdcplib/win32-cross-compilation.patch
        $(MOVE)
 
 .asdcplib: asdcplib
-       cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+       $(RECONF)
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-freedist
        cd $< && $(MAKE) install
        touch $@

diff --git a/contrib/src/asdcplib/win32-cross-compilation.patch b/contrib/src/asdcplib/win32-cross-compilation.patch
new file mode 100644 (file)
index 0000000..8bf39a2
--- /dev/null
+++ b/contrib/src/asdcplib/win32-cross-compilation.patch
@@ -0,0 +1,12 @@
+--- asdcplib/configure.ac      2014-01-06 20:08:54.000000000 +0100
++++ asdcplib/configure.ac.new  2014-05-16 13:05:45.689691678 +0200
+@@ -49,6 +49,9 @@
+ AC_CANONICAL_HOST
+ case $host_os in
+        openbsd*) openbsd_host=true ;;
++       cygwin* | mingw32*)
++            openbsd_host=false
++            CPPFLAGS="${CPPFLAGS} -DKM_WIN32" ;;
+        *)        openbsd_host=false ;;
+ esac
+ AM_CONDITIONAL([OPENBSD_HOST], [test x$openbsd_host = xtrue])