|
 |
242bd2 |
From 3a006cd795855bf2cad86e0e86cd485d27548f36 Mon Sep 17 00:00:00 2001
|
|
|
242bd2 |
From: Tomas Hozza <thozza@redhat.com>
|
|
|
242bd2 |
Date: Fri, 19 Jul 2013 12:11:44 +0200
|
|
|
242bd2 |
Subject: [PATCH] Make ldns-config multilib clean
|
|
|
242bd2 |
|
|
|
242bd2 |
Signed-off-by: Tomas Hozza <thozza@redhat.com>
|
|
|
242bd2 |
---
|
|
|
242bd2 |
configure | 3 +++
|
|
|
242bd2 |
packaging/ldns-config.1 | 4 ++++
|
|
|
242bd2 |
packaging/ldns-config.in | 26 +++++++++++++++++++++-----
|
|
|
242bd2 |
3 files changed, 28 insertions(+), 5 deletions(-)
|
|
|
242bd2 |
|
|
|
242bd2 |
diff --git a/configure b/configure
|
|
|
242bd2 |
index be312d1..ec8d551 100755
|
|
|
242bd2 |
--- a/configure
|
|
|
242bd2 |
+++ b/configure
|
|
|
242bd2 |
@@ -674,6 +674,7 @@ PYTHON_SITE_PKG
|
|
|
242bd2 |
PYTHON_LDFLAGS
|
|
|
242bd2 |
PYTHON_CPPFLAGS
|
|
|
242bd2 |
PYTHON
|
|
|
242bd2 |
+PYTHON_LIB
|
|
|
242bd2 |
PYTHON_VERSION
|
|
|
242bd2 |
UNINSTALL_CONFIG_MANPAGE
|
|
|
242bd2 |
UNINSTALL_CONFIG
|
|
|
242bd2 |
@@ -6356,6 +6357,7 @@ EOD
|
|
|
242bd2 |
# use the official shared library
|
|
|
242bd2 |
ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
|
|
|
242bd2 |
PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
|
|
|
242bd2 |
+ PYTHON_LIB="$ac_python_library"
|
|
|
242bd2 |
else
|
|
|
242bd2 |
# old way: use libpython from python_configdir
|
|
|
242bd2 |
ac_python_libdir=`$PYTHON -c \
|
|
|
242bd2 |
@@ -6363,6 +6365,7 @@ EOD
|
|
|
242bd2 |
import os; \
|
|
|
242bd2 |
print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
|
|
|
242bd2 |
PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
|
|
|
242bd2 |
+ PYTHON_LIB="python$ac_python_version"
|
|
|
242bd2 |
fi
|
|
|
242bd2 |
|
|
|
242bd2 |
if test -z "PYTHON_LDFLAGS"; then
|
|
|
242bd2 |
diff --git a/packaging/ldns-config.1 b/packaging/ldns-config.1
|
|
|
242bd2 |
index c5a00a1..1e4ff93 100644
|
|
|
242bd2 |
--- a/packaging/ldns-config.1
|
|
|
242bd2 |
+++ b/packaging/ldns-config.1
|
|
|
242bd2 |
@@ -23,6 +23,10 @@ Show the C compiler flags needed to compile with ldns
|
|
|
242bd2 |
Show the flags to be used to link with ldns
|
|
|
242bd2 |
|
|
|
242bd2 |
.TP
|
|
|
242bd2 |
+\fB--libs_sec\fR
|
|
|
242bd2 |
+Show the flags to be used to link with ldns compiled for secondary architecture.
|
|
|
242bd2 |
+
|
|
|
242bd2 |
+.TP
|
|
|
242bd2 |
\fB--version\fR
|
|
|
242bd2 |
Shows the version of the installed ldns library
|
|
|
242bd2 |
|
|
|
242bd2 |
diff --git a/packaging/ldns-config.in b/packaging/ldns-config.in
|
|
|
242bd2 |
index b728ba5..e34051f 100755
|
|
|
242bd2 |
--- a/packaging/ldns-config.in
|
|
|
242bd2 |
+++ b/packaging/ldns-config.in
|
|
|
242bd2 |
@@ -3,12 +3,24 @@
|
|
|
242bd2 |
prefix="@prefix@"
|
|
|
242bd2 |
exec_prefix="@exec_prefix@"
|
|
|
242bd2 |
VERSION="@PACKAGE_VERSION@"
|
|
|
242bd2 |
-CFLAGS="@CFLAGS@"
|
|
|
242bd2 |
-CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
|
|
|
242bd2 |
-LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
|
|
|
242bd2 |
LIBS="@LIBS@ @LIBSSL_LIBS@"
|
|
|
242bd2 |
-LIBDIR="@libdir@"
|
|
|
242bd2 |
INCLUDEDIR="@includedir@"
|
|
|
242bd2 |
+ARCH="`uname -m`"
|
|
|
242bd2 |
+
|
|
|
242bd2 |
+case $ARCH in
|
|
|
242bd2 |
+ x86_64 | amd64 | sparc64 | s390x | ppc64)
|
|
|
242bd2 |
+
|
|
|
242bd2 |
+ LIBDIR="/usr/lib64"
|
|
|
242bd2 |
+ LIBDIR_SEC="/usr/lib"
|
|
|
242bd2 |
+ ;;
|
|
|
242bd2 |
+ * )
|
|
|
242bd2 |
+ LIBDIR="/usr/lib"
|
|
|
242bd2 |
+ LIBDIR_SEC="usr/lib64"
|
|
|
242bd2 |
+ ;;
|
|
|
242bd2 |
+esac
|
|
|
242bd2 |
+
|
|
|
242bd2 |
+LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@"
|
|
|
242bd2 |
+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@"
|
|
|
242bd2 |
|
|
|
242bd2 |
for arg in $@
|
|
|
242bd2 |
do
|
|
|
242bd2 |
@@ -20,9 +32,13 @@ do
|
|
|
242bd2 |
then
|
|
|
242bd2 |
echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
|
|
|
242bd2 |
fi
|
|
|
242bd2 |
+ if [ $arg = "--libs_sec" ]
|
|
|
242bd2 |
+ then
|
|
|
242bd2 |
+ echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
|
|
|
242bd2 |
+ fi
|
|
|
242bd2 |
if [ $arg = "-h" ] || [ $arg = "--help" ]
|
|
|
242bd2 |
then
|
|
|
242bd2 |
- echo "Usage: $0 [--cflags] [--libs] [--version]"
|
|
|
242bd2 |
+ echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
|
|
|
242bd2 |
fi
|
|
|
242bd2 |
if [ $arg = "--version" ]
|
|
|
242bd2 |
then
|
|
|
242bd2 |
--
|
|
|
242bd2 |
1.8.3.1
|
|
|
242bd2 |
|