67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
diff -up bind-9.10.1b1/config.h.in.multlib-conflict bind-9.10.1b1/config.h.in
|
|
--- bind-9.10.1b1/config.h.in.multlib-conflict 2014-08-04 12:42:19.750274089 +0200
|
|
+++ bind-9.10.1b1/config.h.in 2014-08-04 12:43:19.334332434 +0200
|
|
@@ -495,7 +495,7 @@ int sigwait(const unsigned int *set, int
|
|
#undef PREFER_GOSTASN1
|
|
|
|
/* The size of `void *', as computed by sizeof. */
|
|
-#undef SIZEOF_VOID_P
|
|
+/* #undef SIZEOF_VOID_P */
|
|
|
|
/* Define to 1 if you have the ANSI C header files. */
|
|
#undef STDC_HEADERS
|
|
diff -up bind-9.10.1b1/configure.in.multlib-conflict bind-9.10.1b1/configure.in
|
|
--- bind-9.10.1b1/configure.in.multlib-conflict 2014-08-04 12:42:19.751274090 +0200
|
|
+++ bind-9.10.1b1/configure.in 2014-08-04 12:47:50.157648387 +0200
|
|
@@ -2952,7 +2952,9 @@ int getnameinfo(const struct sockaddr *,
|
|
size_t, char *, size_t, int);],
|
|
[ return (0);],
|
|
[AC_MSG_RESULT(size_t for buflen; int for flags)
|
|
- AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
|
|
+ # Changed to solve multilib conflict on Fedora
|
|
+ # AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)
|
|
+ AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
|
|
AC_DEFINE(IRS_GETNAMEINFO_FLAGS_T, int)],
|
|
[AC_MSG_RESULT(not match any subspecies; assume standard definition)
|
|
AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, socklen_t)
|
|
diff -up bind-9.10.1b1/isc-config.sh.in.multlib-conflict bind-9.10.1b1/isc-config.sh.in
|
|
--- bind-9.10.1b1/isc-config.sh.in.multlib-conflict 2014-06-23 06:47:35.000000000 +0200
|
|
+++ bind-9.10.1b1/isc-config.sh.in 2014-08-04 12:42:19.752274091 +0200
|
|
@@ -21,7 +21,18 @@ prefix=@prefix@
|
|
exec_prefix=@exec_prefix@
|
|
exec_prefix_set=
|
|
includedir=@includedir@
|
|
-libdir=@libdir@
|
|
+arch=$(uname -m)
|
|
+
|
|
+case $arch in
|
|
+ x86_64 | amd64 | sparc64 | s390x | ppc64)
|
|
+ libdir=/usr/lib64
|
|
+ sec_libdir=/usr/lib
|
|
+ ;;
|
|
+ * )
|
|
+ libdir=/usr/lib
|
|
+ sec_libdir=/usr/lib64
|
|
+ ;;
|
|
+esac
|
|
|
|
usage()
|
|
{
|
|
@@ -133,6 +144,16 @@ if test x"$echo_libs" = x"true"; then
|
|
if test x"${exec_prefix_set}" = x"true"; then
|
|
includes="-L${exec_prefix}/lib"
|
|
else
|
|
+ if [ ! -x $libdir/libisc.so ] ; then
|
|
+ if [ ! -x $sec_libdir/libisc.so ] ; then
|
|
+ echo "Error: ISC libs not found in $libdir"
|
|
+ if [ -d $sec_libdir ] ; then
|
|
+ echo "Error: ISC libs not found in $sec_libdir"
|
|
+ fi
|
|
+ exit 1
|
|
+ fi
|
|
+ libdir=$sec_libdir
|
|
+ fi
|
|
libs="-L${libdir}"
|
|
fi
|
|
if test x"$liblwres" = x"true" ; then
|