ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Move the include Makefile.tests to the bottom of Makefile.am(s)

Browse Source 
The Makefile.tests was modifying global AM_CFLAGS and LDADD and could
accidentally pull /usr/include to be listed before the internal
libraries, which is known to cause problems if the headers from the
previous version of BIND 9 has been installed on the build machine.
This commit is contained in:
Ondřej Surý
2021-04-21 14:22:18 +02:00
committed by Ondřej Surý
parent 5c82f7c71b
commit e59a359929
17 changed files with 37 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.tests
View File

@@ -1,11 +1,17 @@
# Hey Emacs, this is -*- makefile-automake -*- file! # Hey Emacs, this is -*- makefile-automake -*- file!
# vim: filetype=automake # vim: filetype=automake
unit-local: check
TESTS = $(check_PROGRAMS)
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(CMOCKA_CFLAGS) \ $(CMOCKA_CFLAGS) \
-DNAMED_PLUGINDIR=\"$(libdir)/named\" \ -DNAMED_PLUGINDIR=\"$(libdir)/named\" \
-DSKIPPED_TEST_EXIT_CODE=77 \ -DSKIPPED_TEST_EXIT_CODE=77 \
-DTESTS_DIR=\"$(abs_srcdir)\" -DTESTS_DIR=\"$(abs_srcdir)\"
LDADD = \ LDADD += \
$(CMOCKA_LIBS) $(CMOCKA_LIBS)

1
Makefile.top
View File

@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
-I$(srcdir)/include -I$(srcdir)/include
AM_LDFLAGS = AM_LDFLAGS =
LDADD =
if HOST_MACOS if HOST_MACOS
AM_LDFLAGS += \ AM_LDFLAGS += \

4
bin/check/Makefile.am
View File

@@ -7,7 +7,7 @@ AM_CPPFLAGS += \
$(LIBISCCFG_CFLAGS) \ $(LIBISCCFG_CFLAGS) \
$(LIBBIND9_CFLAGS) $(LIBBIND9_CFLAGS)
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
noinst_LTLIBRARIES = libcheck-tool.la noinst_LTLIBRARIES = libcheck-tool.la
@@ -16,7 +16,7 @@ libcheck_tool_la_SOURCES = \
check-tool.h \ check-tool.h \
check-tool.c check-tool.c
LDADD = \ LDADD += \
libcheck-tool.la \ libcheck-tool.la \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) \ $(LIBDNS_LIBS) \

2
bin/confgen/Makefile.am
View File

@@ -5,7 +5,7 @@ AM_CPPFLAGS += \
$(LIBDNS_CFLAGS) \ $(LIBDNS_CFLAGS) \
-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" -DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\"
LDADD = \ LDADD += \
libconfgen.la \ libconfgen.la \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) $(LIBDNS_LIBS)

6
bin/dig/Makefile.am
View File

@@ -8,7 +8,7 @@ AM_CPPFLAGS += \
$(LIBBIND9_CFLAGS) \ $(LIBBIND9_CFLAGS) \
$(LIBIDN2_CFLAGS) $(LIBIDN2_CFLAGS)
LDADD = \ LDADD += \
libdighost.la \ libdighost.la \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) \ $(LIBDNS_LIBS) \
@@ -19,8 +19,8 @@ LDADD = \
noinst_LTLIBRARIES = libdighost.la noinst_LTLIBRARIES = libdighost.la
libdighost_la_SOURCES = \ libdighost_la_SOURCES = \
dighost.h \ dighost.h \
dighost.c dighost.c
bin_PROGRAMS = dig host nslookup bin_PROGRAMS = dig host nslookup

4
bin/dnssec/Makefile.am
View File

@@ -4,12 +4,12 @@ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS) $(LIBDNS_CFLAGS)
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-DNAMED_CONFFILE=\"${sysconfdir}/named.conf\" -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
noinst_LTLIBRARIES = libdnssectool.la noinst_LTLIBRARIES = libdnssectool.la
LDADD = \ LDADD += \
libdnssectool.la \ libdnssectool.la \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) $(LIBDNS_LIBS)

4
bin/nsupdate/Makefile.am
View File

@@ -10,10 +10,10 @@ AM_CPPFLAGS += \
$(KRB5_CFLAGS) \ $(KRB5_CFLAGS) \
$(READLINE_CFLAGS) $(READLINE_CFLAGS)
AM_CPPFLAGS += \ AM_CPPFLAGS += \
-DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\" -DSESSION_KEYFILE=\"${localstatedir}/run/named/session.key\"
LDADD = \ LDADD += \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) \ $(LIBDNS_LIBS) \
$(LIBISCCFG_LIBS) \ $(LIBISCCFG_LIBS) \

2
bin/pkcs11/Makefile.am
View File

@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.top
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) $(LIBISC_CFLAGS)
LDADD = \ LDADD += \
$(LIBISC_LIBS) $(LIBISC_LIBS)
bin_PROGRAMS = \ bin_PROGRAMS = \

2
bin/tests/system/Makefile.am
View File

@@ -14,7 +14,7 @@ SUBDIRS = dyndb/driver dlzexternal/driver hooks/driver
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) $(LIBISC_CFLAGS)
LDADD = \ LDADD += \
$(LIBISC_LIBS) $(LIBISC_LIBS)
if HAVE_PERL if HAVE_PERL

2
bin/tools/Makefile.am
View File

@@ -4,7 +4,7 @@ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
$(LIBDNS_CFLAGS) $(LIBDNS_CFLAGS)
LDADD = \ LDADD += \
$(LIBDNS_LIBS) \ $(LIBDNS_LIBS) \
$(LIBISC_LIBS) $(LIBISC_LIBS)

2
fuzz/Makefile.am
View File

@@ -8,7 +8,7 @@ AM_CPPFLAGS += \
AM_LDFLAGS += \ AM_LDFLAGS += \
$(FUZZ_LDFLAGS) $(FUZZ_LDFLAGS)
LDADD = \ LDADD += \
libfuzzmain.la \ libfuzzmain.la \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) $(LIBDNS_LIBS)

13
lib/dns/tests/Makefile.am
View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
@@ -8,9 +7,9 @@ AM_CPPFLAGS += \
-DSRCDIR=\"$(abs_srcdir)\" \ -DSRCDIR=\"$(abs_srcdir)\" \
-DBUILDDIR=\"$(abs_builddir)\" -DBUILDDIR=\"$(abs_builddir)\"
LDADD += \ LDADD += \
libdnstest.la \ libdnstest.la \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBDNS_LIBS) $(LIBDNS_LIBS)
check_LTLIBRARIES = libdnstest.la check_LTLIBRARIES = libdnstest.la
@@ -48,8 +47,6 @@ check_PROGRAMS = \
zonemgr_test \ zonemgr_test \
zt_test zt_test
TESTS = $(check_PROGRAMS)
if HAVE_PERL if HAVE_PERL
check_PROGRAMS += \ check_PROGRAMS += \
@@ -109,8 +106,6 @@ rsa_test_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
$(OPENSSL_CFLAGS) $(OPENSSL_CFLAGS)
unit-local: check
EXTRA_DIST = \ EXTRA_DIST = \
Kdh.+002+18602.key \ Kdh.+002+18602.key \
Krsa.+005+29235.key \ Krsa.+005+29235.key \
@@ -118,4 +113,4 @@ EXTRA_DIST = \
testdata \ testdata \
testkeys testkeys
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh include $(top_srcdir)/Makefile.tests

9
lib/irs/tests/Makefile.am
View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
@@ -9,13 +8,9 @@ LDADD += \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBIRS_LIBS) $(LIBIRS_LIBS)
check_PROGRAMS = \ check_PROGRAMS = \
resconf_test resconf_test
TESTS = $(check_PROGRAMS)
unit-local: check
EXTRA_DIST = testdata EXTRA_DIST = testdata
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh include $(top_srcdir)/Makefile.tests

10
lib/isc/tests/Makefile.am
View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) $(LIBISC_CFLAGS)
@@ -15,7 +14,7 @@ libisctest_la_SOURCES = \
isctest.h \ isctest.h \
uv_wrap.h uv_wrap.h
TESTS = \ check_PROGRAMS = \
aes_test \ aes_test \
buffer_test \ buffer_test \
counter_test \ counter_test \
@@ -49,9 +48,6 @@ TESTS = \
time_test \ time_test \
timer_test timer_test
check_PROGRAMS = \
$(TESTS)
doh_test_CPPFLAGS = \ doh_test_CPPFLAGS = \
$(AM_CPPFLAGS) \ $(AM_CPPFLAGS) \
$(LIBUV_CFLAGS) \ $(LIBUV_CFLAGS) \
@@ -91,8 +87,6 @@ netmgr_test_LDADD = \
$(LDADD) \ $(LDADD) \
$(LIBUV_LIBS) $(LIBUV_LIBS)
unit-local: check
EXTRA_DIST = testdata EXTRA_DIST = testdata
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh include $(top_srcdir)/Makefile.tests

9
lib/isccc/tests/Makefile.am
View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
@@ -9,11 +8,7 @@ LDADD += \
$(LIBISC_LIBS) \ $(LIBISC_LIBS) \
$(LIBISCCC_LIBS) $(LIBISCCC_LIBS)
check_PROGRAMS = \ check_PROGRAMS = \
result_test result_test
TESTS = $(check_PROGRAMS) include $(top_srcdir)/Makefile.tests
unit-local: check
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh

11
lib/isccfg/tests/Makefile.am
View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
@@ -11,12 +10,8 @@ LDADD += \
$(LIBDNS_LIBS) \ $(LIBDNS_LIBS) \
$(LIBISCCFG_LIBS) $(LIBISCCFG_LIBS)
check_PROGRAMS = \ check_PROGRAMS = \
duration_test \ duration_test \
parser_test parser_test
TESTS = $(check_PROGRAMS) include $(top_srcdir)/Makefile.tests
unit-local: check
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh

9
lib/ns/tests/Makefile.am
View File

@@ -1,5 +1,4 @@
include $(top_srcdir)/Makefile.top include $(top_srcdir)/Makefile.top
include $(top_srcdir)/Makefile.tests
AM_CPPFLAGS += \ AM_CPPFLAGS += \
$(LIBISC_CFLAGS) \ $(LIBISC_CFLAGS) \
@@ -14,7 +13,7 @@ LDADD += \
check_LTLIBRARIES = libnstest.la check_LTLIBRARIES = libnstest.la
libnstest_la_SOURCES = \ libnstest_la_SOURCES = \
nstest.c \ nstest.c \
nstest.h nstest.h
check_PROGRAMS = \ check_PROGRAMS = \
@@ -23,10 +22,6 @@ check_PROGRAMS = \
plugin_test \ plugin_test \
query_test query_test
TESTS = $(check_PROGRAMS)
unit-local: check
EXTRA_DIST = testdata EXTRA_DIST = testdata
LOG_COMPILER = $(builddir)/../../unit-test-driver.sh include $(top_srcdir)/Makefile.tests