[#3729] Always check ENVIRON_SHLIB_FLAGS

diff --git a/meson.build b/meson.build
index 76689f01724cba41e2345b28902de0db90712805..ad51e6f37eaaf3bbe0dcdd028c9d046273d68100 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -269,6 +269,16 @@ result = cpp.run(
 )
 conf_data.set('CHRONO_SAME_DURATION', result.returncode() == 0)
 
+ENVIRON_SHLIB_FLAGS = []
+result = cpp.links(
+    fs.read('compiler-checks/environ-in-shlib.cc'),
+    name: 'ENVIRON_SHLIB_FLAGS',
+    args: ['--shared', '-fPIC', '-Wl,--no-undefined'],
+)
+if not result
+    ENVIRON_SHLIB_FLAGS += ['b_lundef=false']
+endif
+
 result = cpp.run(
     fs.read('compiler-checks/have-generic-tls-method.cc'),
     name: 'HAVE_GENERIC_TLS_METHOD',
@@ -295,18 +305,6 @@ result = cpp.run(
 )
 conf_data.set('HAVE_STREAM_TRUNCATED_ERROR', result.returncode() == 0)
 
-ENVIRON_SHLIB_FLAGS = []
-if cpp.has_link_argument('-Wl,--no-undefined')
-    result = cpp.links(
-        fs.read('compiler-checks/environ-in-shlib.cc'),
-        name: 'ENVIRON_SHLIB_FLAGS',
-        args: ['--shared', '-fPIC', '-Wl,--no-undefined'],
-    )
-    if not result
-        ENVIRON_SHLIB_FLAGS += ['b_lundef=false']
-    endif
-endif
-
 #### System-specific Variables
 
 SYSTEM = build_machine.system()

diff --git a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
index 4680da84760db99711f0940ffc8770a398c0d61d..65122167d4575547b05e4aef68992b1ff12d3676 100755 (executable)
--- a/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
+++ b/src/bin/dhcp4/tests/dhcp4_process_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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

diff --git a/src/bin/dhcp4/tests/meson-dhcp4_process_tests.sh.in b/src/bin/dhcp4/tests/meson-dhcp4_process_tests.sh.in
index f380286464b3a99e7023d6fba0b57a0dedf3524d..1cf48b0366ec280bdbad8cf97550900565e87cfb 100755 (executable)
--- a/src/bin/dhcp4/tests/meson-dhcp4_process_tests.sh.in
+++ b/src/bin/dhcp4/tests/meson-dhcp4_process_tests.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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

diff --git a/src/bin/dhcp4/tests/meson-test_libraries.h.in b/src/bin/dhcp4/tests/meson-test_libraries.h.in
index 287178b01502f860fea0483b2a77fd64bb9711c0..358787cf2666d875b5824c5f056d6a5fd4de4899 100644 (file)
--- a/src/bin/dhcp4/tests/meson-test_libraries.h.in
+++ b/src/bin/dhcp4/tests/meson-test_libraries.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2024 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2013-2025 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

diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in
index 78922929ea0d1b288482d0925cf22d6d8285522d..ec84b0c6454b3eccefd80d9455ae50c20a6512ba 100755 (executable)
--- a/src/bin/keactrl/keactrl.in
+++ b/src/bin/keactrl/keactrl.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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

diff --git a/src/bin/shell/kea-shell.in b/src/bin/shell/kea-shell.in
index c0007cfd9d486fd70d8d7242cd3264e2d29e8db2..e83eb38e53f6457cb6fd722a49a5cbd3fcccb4ed 100755 (executable)
--- a/src/bin/shell/kea-shell.in
+++ b/src/bin/shell/kea-shell.in
@@ -1,6 +1,6 @@
 #!@PYTHON@
 
-# Copyright (C) 2017-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2017-2025 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

diff --git a/src/lib/testutils/meson-dhcp_test_lib.sh.in b/src/lib/testutils/meson-dhcp_test_lib.sh.in
index 4375bf8b53df67dad3493abfa9702e35ab7b8a6c..65edb299a2e0116c2c342708ccb68e4ec5068582 100755 (executable)
--- a/src/lib/testutils/meson-dhcp_test_lib.sh.in
+++ b/src/lib/testutils/meson-dhcp_test_lib.sh.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2024 Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2014-2025 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