diff options
| author | Tomas Hozza <thozza@redhat.com> | 2015-09-04 01:34:48 +0200 |
|---|---|---|
| committer | Tomas Hozza <thozza@redhat.com> | 2015-09-04 01:50:26 +0200 |
| commit | a3771cee485bdd434dd9ac300c05d24f0c3a7c5c (patch) | |
| tree | c4cd0d4713a7cca855555c4fa8cbe9e2c03749a9 /bind-9.9.1-P2-multlib-conflict.patch | |
| parent | d6c0550f5c209dbb19408bfd69bf0f97f7f682e5 (diff) | |
| download | bind-a3771cee485bdd434dd9ac300c05d24f0c3a7c5c.tar.gz bind-a3771cee485bdd434dd9ac300c05d24f0c3a7c5c.tar.xz bind-a3771cee485bdd434dd9ac300c05d24f0c3a7c5c.zip | |
Update to 9.10.3rc1 (#1259690)
Signed-off-by: Tomas Hozza <thozza@redhat.com>
Diffstat (limited to 'bind-9.9.1-P2-multlib-conflict.patch')
| -rw-r--r-- | bind-9.9.1-P2-multlib-conflict.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bind-9.9.1-P2-multlib-conflict.patch b/bind-9.9.1-P2-multlib-conflict.patch index 7724749..90eb995 100644 --- a/bind-9.9.1-P2-multlib-conflict.patch +++ b/bind-9.9.1-P2-multlib-conflict.patch @@ -1,8 +1,8 @@ diff --git a/config.h.in b/config.h.in -index ff72235..bce1a24 100644 +index 0c340db..dbeecd7 100644 --- a/config.h.in +++ b/config.h.in -@@ -513,7 +513,7 @@ int sigwait(const unsigned int *set, int *sig); +@@ -520,7 +520,7 @@ int sigwait(const unsigned int *set, int *sig); #undef PREFER_GOSTASN1 /* The size of `void *', as computed by sizeof. */ @@ -12,10 +12,10 @@ index ff72235..bce1a24 100644 /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/configure.in b/configure.in -index 10c98c3..d54b036 100644 +index 6b875ba..c39477c 100644 --- a/configure.in +++ b/configure.in -@@ -3048,8 +3048,11 @@ int getnameinfo(const struct sockaddr *, size_t, char *, +@@ -3065,8 +3065,11 @@ int getnameinfo(const struct sockaddr *, size_t, char *, size_t, char *, size_t, int);], [ return (0);], [AC_MSG_RESULT(size_t for buflen; int for flags) @@ -30,7 +30,7 @@ index 10c98c3..d54b036 100644 [AC_MSG_RESULT(not match any subspecies; assume standard definition) AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_t) diff --git a/isc-config.sh.in b/isc-config.sh.in -index 10df275..5215eb0 100644 +index 04a9e5c..67400d8 100644 --- a/isc-config.sh.in +++ b/isc-config.sh.in @@ -21,7 +21,18 @@ prefix=@prefix@ @@ -53,9 +53,9 @@ index 10df275..5215eb0 100644 usage() { -@@ -133,6 +144,16 @@ if test x"$echo_libs" = x"true"; then +@@ -140,6 +151,16 @@ if test x"$echo_libs" = x"true"; then if test x"${exec_prefix_set}" = x"true"; then - includes="-L${exec_prefix}/lib" + libs="-L${exec_prefix}/lib" else + if [ ! -x $libdir/libisc.so ] ; then + if [ ! -x $sec_libdir/libisc.so ] ; then @@ -69,4 +69,4 @@ index 10df275..5215eb0 100644 + fi libs="-L${libdir}" fi - if test x"$liblwres" = x"true" ; then + if test x"$libirs" = x"true" ; then |