ldns/patches/ldns-1.6.17-multilib.patch

   1 diff -Naur ldns-1.6.17-orig/configure ldns-1.6.17/configure
   2 --- ldns-1.6.17-orig/configure  2014-01-10 16:04:50.000000000 -0500
   3 +++ ldns-1.6.17/configure       2014-01-10 20:22:39.138190093 -0500
   4 @@ -662,6 +662,7 @@
   5  PYTHON_LDFLAGS
   6  PYTHON_CPPFLAGS
   7  PYTHON
   8 +PYTHON_LIB
   9  PYTHON_VERSION
  10  UNINSTALL_CONFIG_MANPAGE
  11  UNINSTALL_CONFIG
  12 @@ -13599,6 +13600,7 @@
  13                         # use the official shared library
  14                         ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
  15                         PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library"
  16 +                       PYTHON_LIB="$ac_python_library"
  17                 else
  18                         # old way: use libpython from python_configdir
  19                         ac_python_libdir=`$PYTHON -c \
  20 @@ -13606,6 +13608,7 @@
  21                           import os; \
  22                           print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
  23                         PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version"
  24 +                       PYTHON_LIB="python$ac_python_version"
  25                 fi
  26
  27                 if test -z "PYTHON_LDFLAGS"; then
  28 diff -Naur ldns-1.6.17-orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-config.in
  29 --- ldns-1.6.17-orig/packaging/ldns-config.in   2014-01-10 16:04:41.000000000 -0500
  30 +++ ldns-1.6.17/packaging/ldns-config.in        2014-01-10 20:33:13.033665804 -0500
  31 @@ -3,13 +3,25 @@
  32  prefix="@prefix@"
  33  exec_prefix="@exec_prefix@"
  34  VERSION="@PACKAGE_VERSION@"
  35 -CFLAGS="@CFLAGS@"
  36 -CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@"
  37 -LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@"
  38  LIBS="@LIBS@ @LIBSSL_LIBS@"
  39 -LIBDIR="@libdir@"
  40  INCLUDEDIR="@includedir@"
  41  LIBVERSION="@LIBLDNS_CURRENT@.@LIBLDNS_REVISION@.@LIBLDNS_AGE@"
  42 +ARCH="`uname -m`"
  43 +
  44 +case $ARCH in
  45 +       x86_64 | amd64 | sparc64 | s390x | ppc64)
  46 +
  47 +               LIBDIR="/usr/lib64"
  48 +               LIBDIR_SEC="/usr/lib"
  49 +               ;;
  50 +       * )
  51 +               LIBDIR="/usr/lib"
  52 +               LIBDIR_SEC="/usr/lib64"
  53 +               ;;
  54 +esac
  55 +
  56 +LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@"
  57 +LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@"
  58
  59  for arg in $@
  60  do
  61 @@ -21,9 +33,13 @@
  62      then
  63          echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns"
  64      fi
  65 +    if [ $arg = "--libs_sec" ]
  66 +    then
  67 +        echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns"
  68 +    fi
  69      if [ $arg = "-h" ] || [ $arg = "--help" ]
  70      then
  71 -        echo "Usage: $0 [--cflags] [--libs] [--version]"
  72 +        echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]"
  73      fi
  74      if [ $arg = "--version" ]
  75      then