]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
libns and libirs were underlinked (missing libisc, libdns, libisccfg)
authorOndřej Surý <ondrej@sury.org>
Tue, 28 Apr 2020 09:10:09 +0000 (11:10 +0200)
committerOndřej Surý <ondrej@isc.org>
Mon, 11 May 2020 07:49:53 +0000 (09:49 +0200)
Underlinking states for the situation when a binary uses a symbol not provided
by libraries it is directly linked to.  The libns was not linked to libisc and
libdns, and libirs was not linked to libisc, libdns and libisccfg) while using
symbols from these libraries directly.

lib/irs/Makefile.in
lib/ns/Makefile.in

index 0326121077a5a96c25ab36c450a7c80527f17c2b..c886ddacc94b36ef0c36e1ba0ff4a9a544a2508e 100644 (file)
@@ -25,6 +25,20 @@ CINCLUDES =  -I. -I./include -I${srcdir}/include \
 CDEFINES =
 CWARNINGS =
 
+ISCLIBS =      ../../lib/isc/libisc.@A@ ${OPENSSL_LIBS} ${JSON_C_LIBS} ${LIBXML2_LIBS} ${ZLIB_LIBS}
+
+ISCDEPLIBS =   ../../lib/isc/libisc.@A@
+
+DNSLIBS =      ../../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
+
+DNSDEPLIBS =   ../../lib/dns/libdns.@A@
+
+ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
+
+ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@
+
+LIBS =         @LIBS@
+
 # Alphabetically
 OBJS =         context.@O@ \
                dnsconf.@O@ \
@@ -37,8 +51,6 @@ SRCS =                context.c \
                gai_strerror.c getaddrinfo.c getnameinfo.c \
                resconf.c
 
-LIBS =         @LIBS@
-
 SUBDIRS =      include
 TESTDIRS =     @UNITTESTS@
 TARGETS =      timestamp
@@ -61,7 +73,7 @@ libirs.la: ${OBJS} version.@O@
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libirs.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-               ${OBJS} version.@O@ ${LIBS}
+               ${OBJS} version.@O@ ${ISCLIBS} ${DNSLIBS} ${ISCCFGLIBS} ${LIBS}
 
 timestamp: libirs.@A@
        touch timestamp
index 97aaaf683c808162132e2569f82a77294faee85e..8e5f2f60c42ab5fb1f852e212c2bb74a0d7e2558 100644 (file)
@@ -74,7 +74,7 @@ libns.la: ${OBJS}
        ${LIBTOOL_MODE_LINK} \
                ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libns.la -rpath ${libdir} \
                -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \
-               ${OBJS} ${ISCLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
+               ${OBJS} ${ISCLIBS} ${DNSLIBS} @DNS_CRYPTO_LIBS@ ${LIBS}
 
 timestamp: libns.@A@
        touch timestamp