]> git.ipfire.org Git - ipfire-3.x.git/blame - bind/patches/bind97-exportlib.patch
git: Update to 2.23.0
[ipfire-3.x.git] / bind / patches / bind97-exportlib.patch
CommitLineData
1fc9ac36
SS
1diff -up bind-9.9.3rc2/isc-config.sh.in.exportlib bind-9.9.3rc2/isc-config.sh.in
2diff -up bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib bind-9.9.3rc2/lib/export/dns/Makefile.in
3--- bind-9.9.3rc2/lib/export/dns/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200
4+++ bind-9.9.3rc2/lib/export/dns/Makefile.in 2013-05-13 10:45:22.574089729 +0200
ac29baf9
SS
5@@ -35,9 +35,9 @@ CDEFINES = -DUSE_MD5 @USE_OPENSSL@ @USE_
6
7 CWARNINGS =
8
9-ISCLIBS = ../isc/libisc.@A@
10+ISCLIBS = ../isc/libisc-export.@A@
11
12-ISCDEPLIBS = ../isc/libisc.@A@
13+ISCDEPLIBS = ../isc/libisc-export.@A@
14
15 LIBS = @LIBS@
16
1fc9ac36 17@@ -116,29 +116,29 @@ version.@O@: ${srcdir}/version.c
ac29baf9
SS
18 -DLIBAGE=${LIBAGE} \
19 -c ${srcdir}/version.c
20
21-libdns.@SA@: ${OBJS}
22+libdns-export.@SA@: ${OBJS}
23 ${AR} ${ARFLAGS} $@ ${OBJS}
24 ${RANLIB} $@
25
26-libdns.la: ${OBJS}
27+libdns-export.la: ${OBJS}
28 ${LIBTOOL_MODE_LINK} \
29- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la \
30+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns-export.la \
31 -rpath ${export_libdir} \
32 -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
33 ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
34
35-timestamp: libdns.@A@
36+timestamp: libdns-export.@A@
37 touch timestamp
38
39 installdirs:
40 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
41
42 install:: timestamp installdirs
43- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libdns.@A@ \
44+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libdns-export.@A@ \
45 ${DESTDIR}${export_libdir}/
46
47 clean distclean::
48- rm -f libdns.@A@ timestamp
49+ rm -f libdns-export.@A@ timestamp
50 rm -f gen code.h include/dns/enumtype.h include/dns/enumclass.h
51 rm -f include/dns/rdatastruct.h
52
1fc9ac36
SS
53diff -up bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib bind-9.9.3rc2/lib/export/irs/Makefile.in
54--- bind-9.9.3rc2/lib/export/irs/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200
55+++ bind-9.9.3rc2/lib/export/irs/Makefile.in 2013-05-13 10:45:22.575089729 +0200
56@@ -43,9 +43,9 @@ SRCS = context.c \
ac29baf9
SS
57 gai_sterror.c getaddrinfo.c getnameinfo.c \
58 resconf.c
59
60-ISCLIBS = ../isc/libisc.@A@
61-DNSLIBS = ../dns/libdns.@A@
62-ISCCFGLIBS = ../isccfg/libisccfg.@A@
63+ISCLIBS = ../isc/libisc-export.@A@
64+DNSLIBS = ../dns/libdns-export.@A@
65+ISCCFGLIBS = ../isccfg/libisccfg-export.@A@
66
67 LIBS = @LIBS@
68
1fc9ac36 69@@ -62,26 +62,26 @@ version.@O@: ${srcdir}/version.c
ac29baf9
SS
70 -DLIBAGE=${LIBAGE} \
71 -c ${srcdir}/version.c
72
73-libirs.@SA@: ${OBJS} version.@O@
74+libirs-export.@SA@: ${OBJS} version.@O@
75 ${AR} ${ARFLAGS} $@ ${OBJS} version.@O@
76 ${RANLIB} $@
77
78-libirs.la: ${OBJS} version.@O@
79+libirs-export.la: ${OBJS} version.@O@
80 ${LIBTOOL_MODE_LINK} \
81- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la \
82+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs-export.la \
83 -rpath ${export_libdir} \
84 -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
85 ${OBJS} version.@O@ ${LIBS} ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS}
86
87-timestamp: libirs.@A@
88+timestamp: libirs-export.@A@
89 touch timestamp
90
91 installdirs:
92 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
93
94 install:: timestamp installdirs
95- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libirs.@A@ \
96+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libirs-export.@A@ \
97 ${DESTDIR}${export_libdir}/
98
99 clean distclean::
100- rm -f libirs.@A@ libirs.la timestamp
101+ rm -f libirs-export.@A@ libirs-export.la timestamp
1fc9ac36
SS
102diff -up bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isccfg/Makefile.in
103--- bind-9.9.3rc2/lib/export/isccfg/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200
104+++ bind-9.9.3rc2/lib/export/isccfg/Makefile.in 2013-05-13 10:45:22.576089729 +0200
ac29baf9
SS
105@@ -30,11 +30,11 @@ CINCLUDES = -I. ${DNS_INCLUDES} -I${expo
106 CDEFINES =
107 CWARNINGS =
108
109-ISCLIBS = ../isc/libisc.@A@
1fc9ac36 110-DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
ac29baf9 111+ISCLIBS = ../isc/libisc-export.@A@
1fc9ac36 112+DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
ac29baf9
SS
113
114 ISCDEPLIBS = ../../lib/isc/libisc.@A@
115-ISCCFGDEPLIBS = libisccfg.@A@
116+ISCCFGDEPLIBS = libisccfg-export.@A@
117
118 LIBS = @LIBS@
119
120@@ -58,26 +58,26 @@ version.@O@: ${srcdir}/version.c
121 -DLIBAGE=${LIBAGE} \
122 -c ${srcdir}/version.c
123
124-libisccfg.@SA@: ${OBJS}
125+libisccfg-export.@SA@: ${OBJS}
126 ${AR} ${ARFLAGS} $@ ${OBJS}
127 ${RANLIB} $@
128
129-libisccfg.la: ${OBJS}
130+libisccfg-export.la: ${OBJS}
131 ${LIBTOOL_MODE_LINK} \
132- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg.la \
133+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisccfg-export.la \
134 -rpath ${export_libdir} \
135 -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
136 ${OBJS} ${LIBS} ${DNSLIBS} ${ISCLIBS}
137
138-timestamp: libisccfg.@A@
139+timestamp: libisccfg-export.@A@
140 touch timestamp
141
142 installdirs:
143 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
144
145 install:: timestamp installdirs
146- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisccfg.@A@ \
147+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisccfg-export.@A@ \
148 ${DESTDIR}${export_libdir}/
149
150 clean distclean::
151- rm -f libisccfg.@A@ timestamp
152+ rm -f libisccfg-export.@A@ timestamp
1fc9ac36
SS
153diff -up bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib bind-9.9.3rc2/lib/export/isc/Makefile.in
154--- bind-9.9.3rc2/lib/export/isc/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200
155+++ bind-9.9.3rc2/lib/export/isc/Makefile.in 2013-05-13 10:45:22.576089729 +0200
156@@ -100,6 +100,10 @@ SRCS = @ISC_EXTRA_SRCS@ \
ac29baf9
SS
157
158 LIBS = @LIBS@
159
160+# Note: the order of SUBDIRS is important.
161+# Attempt to disable parallel processing.
162+.NOTPARALLEL:
163+.NO_PARALLEL:
164 SUBDIRS = include unix nls @ISC_THREAD_DIR@
165 TARGETS = timestamp
166
1fc9ac36 167@@ -113,26 +117,26 @@ version.@O@: ${srcdir}/version.c
ac29baf9
SS
168 -DLIBAGE=${LIBAGE} \
169 -c ${srcdir}/version.c
170
171-libisc.@SA@: ${OBJS}
172+libisc-export.@SA@: ${OBJS}
173 ${AR} ${ARFLAGS} $@ ${OBJS}
174 ${RANLIB} $@
175
176-libisc.la: ${OBJS}
177+libisc-export.la: ${OBJS}
178 ${LIBTOOL_MODE_LINK} \
179- ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la \
180+ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc-export.la \
181 -rpath ${export_libdir} \
182 -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
183 ${OBJS} ${LIBS}
184
185-timestamp: libisc.@A@
186+timestamp: libisc-export.@A@
187 touch timestamp
188
189 installdirs:
190 $(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${export_libdir}
191
192 install:: timestamp installdirs
193- ${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ \
194+ ${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} libisc-export.@A@ \
195 ${DESTDIR}${export_libdir}
196
197 clean distclean::
198- rm -f libisc.@A@ libisc.la timestamp
199+ rm -f libisc-export.@A@ libisc-export.la timestamp
1fc9ac36
SS
200diff -up bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib bind-9.9.3rc2/lib/export/samples/Makefile.in
201--- bind-9.9.3rc2/lib/export/samples/Makefile.in.exportlib 2013-04-30 08:38:46.000000000 +0200
202+++ bind-9.9.3rc2/lib/export/samples/Makefile.in 2013-05-13 10:45:22.577089729 +0200
203@@ -31,15 +31,15 @@ CINCLUDES = -I${srcdir}/include -I../dns
ac29baf9
SS
204 CDEFINES =
205 CWARNINGS =
206
207-DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
208-ISCLIBS = ../isc/libisc.@A@
209-ISCCFGLIBS = ../isccfg/libisccfg.@A@
210-IRSLIBS = ../irs/libirs.@A@
ac29baf9
SS
211+DNSLIBS = ../dns/libdns-export.@A@ @DNS_CRYPTO_LIBS@
212+ISCLIBS = ../isc/libisc-export.@A@
213+ISCCFGLIBS = ../isccfg/libisccfg-export.@A@
214+IRSLIBS = ../irs/libirs-export.@A@
1fc9ac36
SS
215
216-DNSDEPLIBS = ../dns/libdns.@A@
217-ISCDEPLIBS = ../isc/libisc.@A@
218-ISCCFGDEPLIBS = ../isccfg/libisccfg.@A@
219-IRSDEPLIBS = ../irs/libirs.@A@
ac29baf9
SS
220+DNSDEPLIBS = ../dns/libdns-export.@A@
221+ISCDEPLIBS = ../isc/libisc-export.@A@
222+ISCCFGDEPLIBS = ../isccfg/libisccfg-export.@A@
223+IRSDEPLIBS = ../irs/libirs-export.@A@
224
225 DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
226