From: Willem Toorop <willem@NLnetLabs.nl>
Date: Mon, 12 Nov 2012 13:59:23 +0000 (+0000)
Subject: Fix building of pyldns on FreeBSD :(
X-Git-Tag: release-1.6.17rc1~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2f6067c9e2a0c235686f9f215a9a65c3d569ad;p=thirdparty%2Fldns.git

Fix building of pyldns on FreeBSD :(
And added regressions tests for pyldns and pyldnsx
---

diff --git a/Makefile.in b/Makefile.in
index 58e1b18c..5c5e2573 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -245,7 +245,7 @@ ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h
 	$(COMP_LIB) -I./include/ldns $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $< -o $@
 
 _ldns.la: ldns_wrapper.lo libldns.la 
-	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-number $(version_info) -no-undefined -o $@ $< -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
+	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-number $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS)
 
 install: install-h install-lib @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_DRILL@ @INSTALL_EXAMPLES@
 
diff --git a/test/01-compile.tpkg b/test/01-compile.tpkg
index 8078a8d6..cf4f89af 100644
Binary files a/test/01-compile.tpkg and b/test/01-compile.tpkg differ
diff --git a/test/30-load-pyldns.tpkg b/test/30-load-pyldns.tpkg
new file mode 100644
index 00000000..aeb34e7e
Binary files /dev/null and b/test/30-load-pyldns.tpkg differ
diff --git a/test/31-load-pyldnsx.tpkg b/test/31-load-pyldnsx.tpkg
new file mode 100644
index 00000000..585226a3
Binary files /dev/null and b/test/31-load-pyldnsx.tpkg differ