From e0e644352c369246f042714f7f80f5bb25cdc2e9 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 19 Nov 2020 10:35:57 +0100 Subject: [PATCH 1/2] Revise OPTIONS.md - The STD_CDEFINES build-time variable was dropped when the build system was migrated to Automake. CPPFLAGS is the variable which should now be used for setting preprocessor macros. - Sort the list of preprocessor macros which affect BIND behavior. Remove ISC_BUFFER_USEINLINE from the list as it can be controlled using its relevant ./configure option (--enable-buffer-useinline). Rename NS_RUN_PID_DIR to NAMED_RUN_PID_DIR to match the source code. - Tweak Markdown formatting. --- OPTIONS.md | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/OPTIONS.md b/OPTIONS.md index 0382c6d7fc..642d9549fc 100644 --- a/OPTIONS.md +++ b/OPTIONS.md @@ -8,20 +8,19 @@ - See the COPYRIGHT file distributed with this work for additional - information regarding copyright ownership. --> -Setting the `STD_CDEFINES` environment variable before running `configure` -can be used to enable certain compile-time options that are not explicitly -defined in `configure`. +Setting the `CPPFLAGS` environment variable before running `configure` +can be used to enable certain compile-time options that are not +explicitly defined in `configure`. Some of these settings are: -|Setting |Description | -|-----------------------------------|----------------------------------------| -|`-DISC_MEM_DEFAULTFILL=1`|Overwrite memory with tag values when allocating or freeing it; this impairs performance but makes debugging of memory problems easier.| -|`-DISC_MEM_TRACKLINES=0`|Don't track memory allocations by file and line number; this improves performance but makes debugging more difficult.| -|`-DISC_FACILITY=LOG_LOCAL0`|Change the default syslog facility for `named`| -|`-DNS_CLIENT_DROPPORT=0`|Disable dropping queries from particular well-known ports:| -|`-DCHECK_SIBLING=0`|Don't check sibling glue in `named-checkzone`| -|`-DCHECK_LOCAL=0`|Don't check out-of-zone addresses in `named-checkzone`| -|`-DNS_RUN_PID_DIR=0`|Create default PID files in `${localstatedir}/run` rather than `${localstatedir}/run/named/`| -|`-DISC_BUFFER_USEINLINE=0`|Disable the use of inline functions to implement the `isc_buffer` API: this reduces performance but may be useful when debugging | -|`-DISC_HEAP_CHECK`|Test heap consistency after every heap operation; used when debugging| +| Setting | Description | +| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------------------- | +| `-DCHECK_LOCAL=0` | Don't check out-of-zone addresses in `named-checkzone` | +| `-DCHECK_SIBLING=0` | Don't check sibling glue in `named-checkzone` | +| `-DISC_FACILITY=LOG_LOCAL0` | Change the default syslog facility for `named` | +| `-DISC_HEAP_CHECK` | Test heap consistency after every heap operation; used when debugging | +| `-DISC_MEM_DEFAULTFILL=1` | Overwrite memory with tag values when allocating or freeing it; this impairs performance but makes debugging of memory problems easier | +| `-DISC_MEM_TRACKLINES=0` | Don't track memory allocations by file and line number; this improves performance but makes debugging more difficult | +| `-DNAMED_RUN_PID_DIR=0` | Create default PID files in `${localstatedir}/run` rather than `${localstatedir}/run/named/` | +| `-DNS_CLIENT_DROPPORT=0` | Disable dropping queries from particular well-known ports | From 9567cefd39f7f990d00df3afc5c1c163dab1d587 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 19 Nov 2020 12:33:27 +0100 Subject: [PATCH 2/2] Drop bin/tests/headerdep_test.sh.in The bin/tests/headerdep_test.sh script has not been updated since it was first created and it cannot be used as-is with the current BIND source code. Better tools (e.g. "include-what-you-use") emerged since the script was committed back in 2000, so instead of trying to bring it up to date, remove it from the source repository. --- bin/tests/.gitignore | 1 - bin/tests/headerdep_test.sh.in | 49 ---------------------------------- util/copyrights | 1 - 3 files changed, 51 deletions(-) delete mode 100644 bin/tests/headerdep_test.sh.in diff --git a/bin/tests/.gitignore b/bin/tests/.gitignore index 7ec87dd31a..0946f966d0 100644 --- a/bin/tests/.gitignore +++ b/bin/tests/.gitignore @@ -1,5 +1,4 @@ .libs -headerdep_test.sh nxtify sdig *_test diff --git a/bin/tests/headerdep_test.sh.in b/bin/tests/headerdep_test.sh.in deleted file mode 100644 index e54b157c60..0000000000 --- a/bin/tests/headerdep_test.sh.in +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Copyright (C) Internet Systems Consortium, Inc. ("ISC") -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, you can obtain one at https://mozilla.org/MPL/2.0/. -# -# See the COPYRIGHT file distributed with this work for additional -# information regarding copyright ownership. - -# -# Check the installed bind9 headers to make sure that no header -# depends on another header having been included first. -# - -prefix=@prefix@ -tmp=/tmp/thdr$$.tmp - -status=0 - -echo "Checking for header interdependencies..." - -# Make a list of header files. -(cd $prefix/include; find . -name '*.h' -print | sed 's!^./!!') > $tmp - -# Check each header. -while read h -do - echo " - <$h>" - - # Build a test program. - cat <test.c -#include <$h> -EOF - - # Compile the test program. - if - gcc @STD_CWARNINGS@ @STD_CINCLUDES@ -I$prefix/include -c test.c 2>&1 - then - : - else - status=1 - fi -done <$tmp - -rm -f test.c test.o $tmp - -exit $status diff --git a/util/copyrights b/util/copyrights index 4b1f2b8f5c..47081e0825 100644 --- a/util/copyrights +++ b/util/copyrights @@ -199,7 +199,6 @@ ./bin/rndc/win32/rndc.vcxproj.in X 2013,2015,2016,2017,2018,2019,2020 ./bin/rndc/win32/rndc.vcxproj.user X 2013,2018,2019,2020 ./bin/tests/fromhex.pl PERL 2015,2016,2018,2019,2020 -./bin/tests/headerdep_test.sh.in SH 2000,2001,2004,2007,2012,2016,2018,2019,2020 ./bin/tests/prepare-softhsm2.sh SH 2020 ./bin/tests/startperf/README X 2011,2018,2019,2020 ./bin/tests/startperf/clean.sh SH 2011,2012,2016,2018,2019,2020