| 1 |
unnilennium |
1.1 |
From 3a006cd795855bf2cad86e0e86cd485d27548f36 Mon Sep 17 00:00:00 2001 |
| 2 |
|
|
From: Tomas Hozza <thozza@redhat.com> |
| 3 |
|
|
Date: Fri, 19 Jul 2013 12:11:44 +0200 |
| 4 |
|
|
Subject: [PATCH] Make ldns-config multilib clean |
| 5 |
|
|
|
| 6 |
|
|
Signed-off-by: Tomas Hozza <thozza@redhat.com> |
| 7 |
|
|
--- |
| 8 |
|
|
configure | 3 +++ |
| 9 |
|
|
packaging/ldns-config.1 | 4 ++++ |
| 10 |
|
|
packaging/ldns-config.in | 26 +++++++++++++++++++++----- |
| 11 |
|
|
3 files changed, 28 insertions(+), 5 deletions(-) |
| 12 |
|
|
|
| 13 |
|
|
diff --git a/configure b/configure |
| 14 |
|
|
index be312d1..ec8d551 100755 |
| 15 |
|
|
--- a/configure |
| 16 |
|
|
+++ b/configure |
| 17 |
|
|
@@ -674,6 +674,7 @@ PYTHON_SITE_PKG |
| 18 |
|
|
PYTHON_LDFLAGS |
| 19 |
|
|
PYTHON_CPPFLAGS |
| 20 |
|
|
PYTHON |
| 21 |
|
|
+PYTHON_LIB |
| 22 |
|
|
PYTHON_VERSION |
| 23 |
|
|
UNINSTALL_CONFIG_MANPAGE |
| 24 |
|
|
UNINSTALL_CONFIG |
| 25 |
|
|
@@ -6356,6 +6357,7 @@ EOD |
| 26 |
|
|
# use the official shared library |
| 27 |
|
|
ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` |
| 28 |
|
|
PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" |
| 29 |
|
|
+ PYTHON_LIB="$ac_python_library" |
| 30 |
|
|
else |
| 31 |
|
|
# old way: use libpython from python_configdir |
| 32 |
|
|
ac_python_libdir=`$PYTHON -c \ |
| 33 |
|
|
@@ -6363,6 +6365,7 @@ EOD |
| 34 |
|
|
import os; \ |
| 35 |
|
|
print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"` |
| 36 |
|
|
PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" |
| 37 |
|
|
+ PYTHON_LIB="python$ac_python_version" |
| 38 |
|
|
fi |
| 39 |
|
|
|
| 40 |
|
|
if test -z "PYTHON_LDFLAGS"; then |
| 41 |
|
|
diff --git a/packaging/ldns-config.1 b/packaging/ldns-config.1 |
| 42 |
|
|
index c5a00a1..1e4ff93 100644 |
| 43 |
|
|
--- a/packaging/ldns-config.1 |
| 44 |
|
|
+++ b/packaging/ldns-config.1 |
| 45 |
|
|
@@ -23,6 +23,10 @@ Show the C compiler flags needed to compile with ldns |
| 46 |
|
|
Show the flags to be used to link with ldns |
| 47 |
|
|
|
| 48 |
|
|
.TP |
| 49 |
|
|
+\fB--libs_sec\fR |
| 50 |
|
|
+Show the flags to be used to link with ldns compiled for secondary architecture. |
| 51 |
|
|
+ |
| 52 |
|
|
+.TP |
| 53 |
|
|
\fB--version\fR |
| 54 |
|
|
Shows the version of the installed ldns library |
| 55 |
|
|
|
| 56 |
|
|
diff --git a/packaging/ldns-config.in b/packaging/ldns-config.in |
| 57 |
|
|
index b728ba5..e34051f 100755 |
| 58 |
|
|
--- a/packaging/ldns-config.in |
| 59 |
|
|
+++ b/packaging/ldns-config.in |
| 60 |
|
|
@@ -3,12 +3,24 @@ |
| 61 |
|
|
prefix="@prefix@" |
| 62 |
|
|
exec_prefix="@exec_prefix@" |
| 63 |
|
|
VERSION="@PACKAGE_VERSION@" |
| 64 |
|
|
-CFLAGS="@CFLAGS@" |
| 65 |
|
|
-CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@" |
| 66 |
|
|
-LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@" |
| 67 |
|
|
LIBS="@LIBS@ @LIBSSL_LIBS@" |
| 68 |
|
|
-LIBDIR="@libdir@" |
| 69 |
|
|
INCLUDEDIR="@includedir@" |
| 70 |
|
|
+ARCH="`uname -m`" |
| 71 |
|
|
+ |
| 72 |
|
|
+case $ARCH in |
| 73 |
|
|
+ x86_64 | amd64 | sparc64 | s390x | ppc64) |
| 74 |
|
|
+ |
| 75 |
|
|
+ LIBDIR="/usr/lib64" |
| 76 |
|
|
+ LIBDIR_SEC="/usr/lib" |
| 77 |
|
|
+ ;; |
| 78 |
|
|
+ * ) |
| 79 |
|
|
+ LIBDIR="/usr/lib" |
| 80 |
|
|
+ LIBDIR_SEC="usr/lib64" |
| 81 |
|
|
+ ;; |
| 82 |
|
|
+esac |
| 83 |
|
|
+ |
| 84 |
|
|
+LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@" |
| 85 |
|
|
+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@" |
| 86 |
|
|
|
| 87 |
|
|
for arg in $@ |
| 88 |
|
|
do |
| 89 |
|
|
@@ -20,9 +32,13 @@ do |
| 90 |
|
|
then |
| 91 |
|
|
echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns" |
| 92 |
|
|
fi |
| 93 |
|
|
+ if [ $arg = "--libs_sec" ] |
| 94 |
|
|
+ then |
| 95 |
|
|
+ echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns" |
| 96 |
|
|
+ fi |
| 97 |
|
|
if [ $arg = "-h" ] || [ $arg = "--help" ] |
| 98 |
|
|
then |
| 99 |
|
|
- echo "Usage: $0 [--cflags] [--libs] [--version]" |
| 100 |
|
|
+ echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]" |
| 101 |
|
|
fi |
| 102 |
|
|
if [ $arg = "--version" ] |
| 103 |
|
|
then |
| 104 |
|
|
-- |
| 105 |
|
|
1.8.3.1 |
| 106 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
