/[packages]/cauldron/bind/current/SOURCES/bind97-exportlib.patch
ViewVC logotype

Diff of /cauldron/bind/current/SOURCES/bind97-exportlib.patch

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

revision 431337 by pterjan, Thu Jan 17 21:30:27 2013 UTC revision 431338 by oden, Wed May 29 08:17:13 2013 UTC
# Line 1  Line 1 
1  diff -up bind-9.7.2-P2/isc-config.sh.in.exportlib bind-9.7.2-P2/isc-config.sh.in  diff -up bind-9.9.3rc2/isc-config.sh.in.exportlib bind-9.9.3rc2/isc-config.sh.in
2  --- bind-9.7.2-P2/isc-config.sh.in.exportlib    2007-06-20 01:46:59.000000000 +0200  diff -up bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib bind-9.9.3rc2/lib/export/dns/Makefile.in
3  +++ bind-9.7.2-P2/isc-config.sh.in      2010-10-20 14:05:25.423861548 +0200  --- bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib  2013-04-30 08:38:46.000000000 +0200
4  @@ -20,6 +20,8 @@  +++ bind-9.9.3rc2/lib/export/dns/Makefile.in    2013-05-13 10:45:22.574089729 +0200
  prefix=@prefix@  
  exec_prefix=@exec_prefix@  
  exec_prefix_set=  
 +libdir=@libdir@  
 +includedir=@includedir@  
   
  usage()  
  {  
 @@ -115,14 +117,14 @@ if test x"$echo_exec_prefix" = x"true" ;  
         echo $exec_prefix  
  fi  
  if test x"$echo_cflags" = x"true"; then  
 -       includes="-I${exec_prefix}/include"  
 +       includes="-I${includedir}"  
         if test x"$libisc" = x"true"; then  
                 includes="$includes @ALWAYS_DEFINES@ @STD_CINCLUDES@ @STD_CDEFINES@ @CCOPT@"  
         fi  
         echo $includes  
  fi  
  if test x"$echo_libs" = x"true"; then  
 -       libs=-L${exec_prefix}/lib  
 +       libs="-L${libdir}"  
         if test x"$liblwres" = x"true" ; then  
                 libs="$libs -llwres"  
         fi  
 diff -up bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib bind-9.7.2-P2/lib/export/dns/Makefile.in  
 --- bind-9.7.2-P2/lib/export/dns/Makefile.in.exportlib  2010-06-10 01:49:43.000000000 +0200  
 +++ bind-9.7.2-P2/lib/export/dns/Makefile.in    2010-10-20 14:08:58.123772859 +0200  
5  @@ -35,9 +35,9 @@ CDEFINES =    -DUSE_MD5 @USE_OPENSSL@ @USE_  @@ -35,9 +35,9 @@ CDEFINES =    -DUSE_MD5 @USE_OPENSSL@ @USE_
6    
7   CWARNINGS =   CWARNINGS =
# Line 42  diff -up bind-9.7.2-P2/lib/export/dns/Ma Line 14  diff -up bind-9.7.2-P2/lib/export/dns/Ma
14    
15   LIBS =         @LIBS@   LIBS =         @LIBS@
16    
17  @@ -114,29 +114,29 @@ version.@O@: ${srcdir}/version.c  @@ -116,29 +116,29 @@ version.@O@: ${srcdir}/version.c
18                  -DLIBAGE=${LIBAGE} \                  -DLIBAGE=${LIBAGE} \
19                  -c ${srcdir}/version.c                  -c ${srcdir}/version.c
20    
# Line 78  diff -up bind-9.7.2-P2/lib/export/dns/Ma Line 50  diff -up bind-9.7.2-P2/lib/export/dns/Ma
50          rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h          rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
51          rm -f include/dns/rdatastruct.h          rm -f include/dns/rdatastruct.h
52    
53  diff -up bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib bind-9.7.2-P2/lib/export/irs/Makefile.in  diff -up bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib bind-9.9.3rc2/lib/export/irs/Makefile.in
54  --- bind-9.7.2-P2/lib/export/irs/Makefile.in.exportlib  2009-12-06 00:31:40.000000000 +0100  --- bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib  2013-04-30 08:38:46.000000000 +0200
55  +++ bind-9.7.2-P2/lib/export/irs/Makefile.in    2010-10-20 14:10:39.893717488 +0200  +++ bind-9.9.3rc2/lib/export/irs/Makefile.in    2013-05-13 10:45:22.575089729 +0200
56  @@ -42,9 +42,9 @@ SRCS =                context.c \  @@ -43,9 +43,9 @@ SRCS =                context.c \
57                  gai_sterror.c getaddrinfo.c getnameinfo.c \                  gai_sterror.c getaddrinfo.c getnameinfo.c \
58                  resconf.c                  resconf.c
59    
# Line 94  diff -up bind-9.7.2-P2/lib/export/irs/Ma Line 66  diff -up bind-9.7.2-P2/lib/export/irs/Ma
66    
67   LIBS =         @LIBS@   LIBS =         @LIBS@
68    
69  @@ -61,26 +61,26 @@ version.@O@: ${srcdir}/version.c  @@ -62,26 +62,26 @@ version.@O@: ${srcdir}/version.c
70                  -DLIBAGE=${LIBAGE} \                  -DLIBAGE=${LIBAGE} \
71                  -c ${srcdir}/version.c                  -c ${srcdir}/version.c
72    
# Line 127  diff -up bind-9.7.2-P2/lib/export/irs/Ma Line 99  diff -up bind-9.7.2-P2/lib/export/irs/Ma
99   clean distclean::   clean distclean::
100  -       rm -f libirs.@A@ libirs.la timestamp  -       rm -f libirs.@A@ libirs.la timestamp
101  +       rm -f libirs-export.@A@ libirs-export.la timestamp  +       rm -f libirs-export.@A@ libirs-export.la timestamp
102  diff -up bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isccfg/Makefile.in  diff -up bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isccfg/Makefile.in
103  --- bind-9.7.2-P2/lib/export/isccfg/Makefile.in.exportlib       2009-12-06 00:31:41.000000000 +0100  --- bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib       2013-04-30 08:38:46.000000000 +0200
104  +++ bind-9.7.2-P2/lib/export/isccfg/Makefile.in 2010-10-20 14:10:14.593741247 +0200  +++ bind-9.9.3rc2/lib/export/isccfg/Makefile.in 2013-05-13 10:45:22.576089729 +0200
105  @@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo  @@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo
106   CDEFINES =   CDEFINES =
107   CWARNINGS =   CWARNINGS =
108    
109  -ISCLIBS =      ../isc/libisc.@A@  -ISCLIBS =      ../isc/libisc.@A@
110  -DNSLIBS =      ../dns/libdns.@A@  -DNSLIBS =      ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
111  +ISCLIBS =      ../isc/libisc-export.@A@  +ISCLIBS =      ../isc/libisc-export.@A@
112  +DNSLIBS =      ../dns/libdns-export.@A@  +DNSLIBS =      ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
113    
114   ISCDEPLIBS =   ../../lib/isc/libisc.@A@   ISCDEPLIBS =   ../../lib/isc/libisc.@A@
115  -ISCCFGDEPLIBS =        libisccfg.@A@  -ISCCFGDEPLIBS =        libisccfg.@A@
# Line 178  diff -up bind-9.7.2-P2/lib/export/isccfg Line 150  diff -up bind-9.7.2-P2/lib/export/isccfg
150   clean distclean::   clean distclean::
151  -       rm -f libisccfg.@A@ timestamp  -       rm -f libisccfg.@A@ timestamp
152  +       rm -f libisccfg-export.@A@ timestamp  +       rm -f libisccfg-export.@A@ timestamp
153  diff -up bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib bind-9.7.2-P2/lib/export/isc/Makefile.in  diff -up bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isc/Makefile.in
154  --- bind-9.7.2-P2/lib/export/isc/Makefile.in.exportlib  2010-06-10 01:49:43.000000000 +0200  --- bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib  2013-04-30 08:38:46.000000000 +0200
155  +++ bind-9.7.2-P2/lib/export/isc/Makefile.in    2010-10-20 14:05:25.433861543 +0200  +++ bind-9.9.3rc2/lib/export/isc/Makefile.in    2013-05-13 10:45:22.576089729 +0200
156  @@ -101,6 +101,10 @@ SRCS =             @ISC_EXTRA_SRCS@ \  @@ -100,6 +100,10 @@ SRCS =             @ISC_EXTRA_SRCS@ \
157    
158   LIBS =         @LIBS@   LIBS =         @LIBS@
159    
# Line 192  diff -up bind-9.7.2-P2/lib/export/isc/Ma Line 164  diff -up bind-9.7.2-P2/lib/export/isc/Ma
164   SUBDIRS =      include unix nls @ISC_THREAD_DIR@   SUBDIRS =      include unix nls @ISC_THREAD_DIR@
165   TARGETS =      timestamp   TARGETS =      timestamp
166    
167  @@ -114,26 +118,26 @@ version.@O@: ${srcdir}/version.c  @@ -113,26 +117,26 @@ version.@O@: ${srcdir}/version.c
168                  -DLIBAGE=${LIBAGE} \                  -DLIBAGE=${LIBAGE} \
169                  -c ${srcdir}/version.c                  -c ${srcdir}/version.c
170    
# Line 225  diff -up bind-9.7.2-P2/lib/export/isc/Ma Line 197  diff -up bind-9.7.2-P2/lib/export/isc/Ma
197   clean distclean::   clean distclean::
198  -       rm -f libisc.@A@ libisc.la timestamp  -       rm -f libisc.@A@ libisc.la timestamp
199  +       rm -f libisc-export.@A@ libisc-export.la timestamp  +       rm -f libisc-export.@A@ libisc-export.la timestamp
200  diff -up bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib bind-9.7.2-P2/lib/export/samples/Makefile.in  diff -up bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib bind-9.9.3rc2/lib/export/samples/Makefile.in
201  --- bind-9.7.2-P2/lib/export/samples/Makefile.in.exportlib      2009-12-06 00:31:41.000000000 +0100  --- bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib      2013-04-30 08:38:46.000000000 +0200
202  +++ bind-9.7.2-P2/lib/export/samples/Makefile.in        2010-10-20 14:05:25.433861543 +0200  +++ bind-9.9.3rc2/lib/export/samples/Makefile.in        2013-05-13 10:45:22.577089729 +0200
203  @@ -30,15 +30,15 @@ CINCLUDES = -I${srcdir}/include -I../dns  @@ -31,15 +31,15 @@ CINCLUDES = -I${srcdir}/include -I../dns
204   CDEFINES =   CDEFINES =
205   CWARNINGS =   CWARNINGS =
206    
# Line 236  diff -up bind-9.7.2-P2/lib/export/sample Line 208  diff -up bind-9.7.2-P2/lib/export/sample
208  -ISCLIBS =      ../isc/libisc.@A@  -ISCLIBS =      ../isc/libisc.@A@
209  -ISCCFGLIBS =   ../isccfg/libisccfg.@A@  -ISCCFGLIBS =   ../isccfg/libisccfg.@A@
210  -IRSLIBS =      ../irs/libirs.@A@  -IRSLIBS =      ../irs/libirs.@A@
 -  
 -DNSDEPLIBS =   ../dns/libdns.@A@  
 -ISCDEPLIBS =   ../isc/libisc.@A@  
 -ISCCFGDEPLIBS =        ../isccfg/libisccfg.@A@  
 -IRSDEPLIBS =   ../irs/libirs.@A@  
211  +DNSLIBS =      ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@  +DNSLIBS =      ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
212  +ISCLIBS =      ../isc/libisc-export.@A@  +ISCLIBS =      ../isc/libisc-export.@A@
213  +ISCCFGLIBS =   ../isccfg/libisccfg-export.@A@  +ISCCFGLIBS =   ../isccfg/libisccfg-export.@A@
214  +IRSLIBS =      ../irs/libirs-export.@A@  +IRSLIBS =      ../irs/libirs-export.@A@
215  +  
216    -DNSDEPLIBS =   ../dns/libdns.@A@
217    -ISCDEPLIBS =   ../isc/libisc.@A@
218    -ISCCFGDEPLIBS =        ../isccfg/libisccfg.@A@
219    -IRSDEPLIBS =   ../irs/libirs.@A@
220  +DNSDEPLIBS =   ../dns/libdns-export.@A@  +DNSDEPLIBS =   ../dns/libdns-export.@A@
221  +ISCDEPLIBS =   ../isc/libisc-export.@A@  +ISCDEPLIBS =   ../isc/libisc-export.@A@
222  +ISCCFGDEPLIBS =        ../isccfg/libisccfg-export.@A@  +ISCCFGDEPLIBS =        ../isccfg/libisccfg-export.@A@
Legend:
Removed from v.431337  
changed lines
  Added in v.431338
  ViewVC Help
Powered by ViewVC 1.1.30