mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-08 18:12:07 -04:00
chg: usr: use native shared library extension
Use the native shared library extension when build loadable libaries. For most platforms this is ".so" but for Darwin it is ".dylib". Closes #5375 Merge branch '5375-use-native-shared-library-extension' into 'main' See merge request isc-projects/bind9!10588
This commit is contained in:
commit
8420adf218
25 changed files with 32 additions and 30 deletions
|
|
@ -538,6 +538,7 @@ copy_setports() {
|
|||
-e "s/@DISABLED_ALGORITHM_NUMBER@/${DISABLED_ALGORITHM_NUMBER}/g" \
|
||||
-e "s/@DISABLED_ALGORITHM_NUMBER@/${DISABLED_ALGORITHM_DST_NUMBER}/g" \
|
||||
-e "s/@DISABLED_BITS@/${DISABLED_BITS}/g" \
|
||||
-e "s/@DYLIB@/${DYLIB}/g" \
|
||||
$1 >$2
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,34 +38,34 @@ controls {
|
|||
};
|
||||
|
||||
dlz "example one" {
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so example.nil";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ example.nil";
|
||||
};
|
||||
|
||||
dlz "example two" {
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so alternate.nil";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ alternate.nil";
|
||||
};
|
||||
|
||||
dlz "example three" {
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so example.org";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ example.org";
|
||||
};
|
||||
|
||||
dlz "example four" {
|
||||
// Long zone name to trigger ISC_R_NOSPACE in dns_sdlz_putrr.
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so 123456789.123456789.123456789.123456789.123456789.example.foo";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ 123456789.123456789.123456789.123456789.123456789.example.foo";
|
||||
};
|
||||
|
||||
dlz "unsearched1" {
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so other.nil";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ other.nil";
|
||||
search no;
|
||||
};
|
||||
|
||||
dlz "unsearched2" {
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so zone.nil";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ zone.nil";
|
||||
search no;
|
||||
};
|
||||
|
||||
dlz redzone {
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.so .";
|
||||
database "dlopen @TOP_BUILDDIR@/testlib-driver-dlzexternal.@DYLIB@ .";
|
||||
search no;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,5 +36,5 @@ controls {
|
|||
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
|
||||
};
|
||||
|
||||
dyndb sample "@TOP_BUILDDIR@/testlib-driver-sample.so" { ipv4.example.nil. in-addr.arpa. };
|
||||
dyndb sample2 "@TOP_BUILDDIR@/testlib-driver-sample.so" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };
|
||||
dyndb sample "@TOP_BUILDDIR@/testlib-driver-sample.@DYLIB@" { ipv4.example.nil. in-addr.arpa. };
|
||||
dyndb sample2 "@TOP_BUILDDIR@/testlib-driver-sample.@DYLIB@" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { none; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
/*
|
||||
* While this matches the defaults, it is not a good configuration
|
||||
* to have in named.conf as the two options contradict each other
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
*/
|
||||
|
||||
view myview {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 no;
|
||||
filter-aaaa { any; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
*/
|
||||
|
||||
view myview {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { none; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { 1.0.0.0/8; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,6 +11,6 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 break-dnssec;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 break-dnssec;
|
||||
filter-aaaa { 1.0.0.0/8; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { 1.0.0.0/8; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
*/
|
||||
|
||||
view myview {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { 1.0.0.0/8; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ options {
|
|||
|
||||
acl filterees { 10.53.0.1; };
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { filterees; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ options {
|
|||
};
|
||||
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v6 yes;
|
||||
filter-aaaa { fd92:7065:b8e:ffff::1; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 yes;
|
||||
filter-aaaa { 10.53.0.2; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v6 yes;
|
||||
filter-aaaa { fd92:7065:b8e:ffff::2; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 break-dnssec;
|
||||
filter-aaaa { 10.53.0.3; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v6 break-dnssec;
|
||||
filter-aaaa { fd92:7065:b8e:ffff::3; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 break-dnssec;
|
||||
filter-aaaa { 10.53.0.4; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v6 break-dnssec;
|
||||
filter-aaaa { fd92:7065:b8e:ffff::4; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ options {
|
|||
minimal-responses no;
|
||||
};
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.so" {
|
||||
plugin query "@TOP_BUILDDIR@/filter-aaaa.@DYLIB@" {
|
||||
filter-aaaa-on-v4 break-dnssec;
|
||||
filter-aaaa { any; };
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ options {
|
|||
};
|
||||
|
||||
|
||||
plugin query "@TOP_BUILDDIR@/testlib-driver-async.so";
|
||||
plugin query "@TOP_BUILDDIR@/testlib-driver-async.@DYLIB@";
|
||||
|
||||
key rndc_key {
|
||||
secret "1234abcd8765";
|
||||
|
|
|
|||
|
|
@ -61,4 +61,5 @@ BASIC_VARS = {
|
|||
),
|
||||
"LC_ALL": "C",
|
||||
"ANS_LOG_LEVEL": "debug",
|
||||
"DYLIB": ("dylib" if os.uname().sysname == "Darwin" else "so"),
|
||||
}
|
||||
|
|
|
|||
|
|
@ -157,5 +157,5 @@ zone "static-stub-nomatch." {
|
|||
# The "BAD" comments below are necessary, because they will be removed using
|
||||
# 'sed' by tests.sh in order to activate the faulty configuration.
|
||||
#BAD dlz "bad-dlz" {
|
||||
#BAD database "dlopen bad-dlz.so example.org";
|
||||
#BAD database "dlopen bad-dlz.@DYLIB@ example.org";
|
||||
#BAD };
|
||||
|
|
|
|||
Loading…
Reference in a new issue