summaryrefslogtreecommitdiff
path: root/ldns-1.7.0-multilib.patch
diff options
context:
space:
mode:
Diffstat (limited to 'ldns-1.7.0-multilib.patch')
-rw-r--r--ldns-1.7.0-multilib.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/ldns-1.7.0-multilib.patch b/ldns-1.7.0-multilib.patch
new file mode 100644
index 0000000..e38112c
--- /dev/null
+++ b/ldns-1.7.0-multilib.patch
@@ -0,0 +1,75 @@
+diff --git a/ldns-1.7.1/configure b/ldns-1.7.1/configure
+index b79067e..543806e 100755
+--- a/ldns-1.7.1/configure
++++ b/ldns-1.7.1/configure
+@@ -684,6 +684,7 @@ PYTHON_SITE_PKG
+ PYTHON_LDFLAGS
+ PYTHON_CPPFLAGS
+ PYTHON
++PYTHON_LIB
+ PYTHON_VERSION
+ UNINSTALL_CONFIG_MANPAGE
+ UNINSTALL_CONFIG
+@@ -14324,6 +14325,7 @@ EOD`
+ # use the official shared library
+ ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
+ PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
++ PYTHON_LIB="$ac_python_library"
+ else
+ # old way: use libpython from python_configdir
+ ac_python_libdir=`$PYTHON -c \
+@@ -14331,6 +14333,7 @@ EOD`
+ import os; \
+ print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
+ PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
++ PYTHON_LIB="python$ac_python_version"
+ fi
+
+ if test -z "PYTHON_LDFLAGS"; then
+diff --git a/ldns-1.7.1/packaging/ldns-config.in b/ldns-1.7.1/packaging/ldns-config.in
+index f147920..5235c7a 100755
+--- a/ldns-1.7.1/packaging/ldns-config.in
++++ b/ldns-1.7.1/packaging/ldns-config.in
+@@ -1,11 +1,26 @@
+ #!/bin/sh
+
+ VERSION="@PACKAGE_VERSION@"
+-LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
+ LIBS="@LIBS@ @LIBSSL_LIBS@"
+ LIBDIR="@libdir@"
+ INCLUDEDIR="@includedir@"
+ LIBVERSION="@VERSION_INFO@"
++ARCH="`uname -m`"
++
++case $ARCH in
++ x86_64 | amd64 | sparc64 | s390x | ppc64)
++
++ LIBDIR="/usr/lib64"
++ LIBDIR_SEC="/usr/lib"
++ ;;
++ * )
++ LIBDIR="/usr/lib"
++ LIBDIR_SEC="/usr/lib64"
++ ;;
++esac
++
++LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@"
++LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@"
+
+ for arg in $@
+ do
+@@ -17,9 +32,13 @@ do
+ then
+ echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
+ fi
++ if [ $arg = "--libs_sec" ]
++ then
++ echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
++ fi
+ if [ $arg = "-h" ] || [ $arg = "--help" ]
+ then
+- echo "Usage: $0 [--cflags] [--libs] [--version]"
++ echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
+ fi
+ if [ $arg = "--version" ]
+ then