/[packages]/cauldron/bind/current/SOURCES/bind-9.9.1-P2-multlib-conflict.patch
ViewVC logotype

Diff of /cauldron/bind/current/SOURCES/bind-9.9.1-P2-multlib-conflict.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1394838 by luigiwalser, Wed Dec 16 00:04:29 2015 UTC revision 1394839 by guillomovitch, Mon Apr 22 20:36:36 2019 UTC
# Line 1  Line 1 
1  diff --git a/config.h.in b/config.h.in  diff --git a/config.h.in b/config.h.in
2  index 0c340db..dbeecd7 100644  index 4ecaa8f..2f65ccc 100644
3  --- a/config.h.in  --- a/config.h.in
4  +++ b/config.h.in  +++ b/config.h.in
5  @@ -520,7 +520,7 @@ int sigwait(const unsigned int *set, int *sig);  @@ -600,7 +600,7 @@ int sigwait(const unsigned int *set, int *sig);
6   #undef PREFER_GOSTASN1   #undef PREFER_GOSTASN1
7    
8   /* The size of `void *', as computed by sizeof. */   /* The size of `void *', as computed by sizeof. */
# Line 11  index 0c340db..dbeecd7 100644 Line 11  index 0c340db..dbeecd7 100644
11    
12   /* Define to 1 if you have the ANSI C header files. */   /* Define to 1 if you have the ANSI C header files. */
13   #undef STDC_HEADERS   #undef STDC_HEADERS
 diff --git a/configure.in b/configure.in  
 index 6b875ba..c39477c 100644  
 --- a/configure.in  
 +++ b/configure.in  
 @@ -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)  
 -        AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)  
 -        AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)  
 +       # Changed to solve multilib conflict on Fedora  
 +       # AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, size_t)  
 +       # AC_DEFINE(IRS_GETNAMEINFO_BUFLEN_T, size_t)  
 +        AC_DEFINE(IRS_GETNAMEINFO_SOCKLEN_T, socklen_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_SOCKLEN_T, socklen_t)  
14  diff --git a/isc-config.sh.in b/isc-config.sh.in  diff --git a/isc-config.sh.in b/isc-config.sh.in
15  index 04a9e5c..67400d8 100644  index a8a0a89..b5e94ed 100644
16  --- a/isc-config.sh.in  --- a/isc-config.sh.in
17  +++ b/isc-config.sh.in  +++ b/isc-config.sh.in
18  @@ -21,7 +21,18 @@ prefix=@prefix@  @@ -13,7 +13,18 @@ prefix=@prefix@
19   exec_prefix=@exec_prefix@   exec_prefix=@exec_prefix@
20   exec_prefix_set=   exec_prefix_set=
21   includedir=@includedir@   includedir=@includedir@
# Line 53  index 04a9e5c..67400d8 100644 Line 35  index 04a9e5c..67400d8 100644
35    
36   usage()   usage()
37   {   {
38  @@ -140,6 +151,16 @@ if test x"$echo_libs" = x"true"; then  @@ -132,6 +143,16 @@ if test x"$echo_libs" = x"true"; then
39          if test x"${exec_prefix_set}" = x"true"; then          if test x"${exec_prefix_set}" = x"true"; then
40                  libs="-L${exec_prefix}/lib"                  libs="-L${exec_prefix}/lib"
41          else          else
Legend:
Removed from v.1394838  
changed lines
  Added in v.1394839
  ViewVC Help
Powered by ViewVC 1.1.30