From f9a777dd5db233a25a377b2d26c0ec49b9e39389 Mon Sep 17 00:00:00 2001
From: Juergen Repp <juergen_repp@web.de>
Date: Fri, 1 Nov 2024 19:12:20 +0100
Subject: [PATCH] m4: fix test ld version script.

* The test macro gl_LD_VERSION_SCRIPT which not work on FreeBSD 14.1
  is simplified and works now also on FreeBSD 14.1
* The option --enable-nodl, which was used as a workaround for this
  problem in the cirrus CI, is removed.

Fixes: #2907

Signed-off-by: Juergen Repp <juergen_repp@web.de>
---
 .cirrus.yml             |  2 +-
 m4/ld-version-script.m4 | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4f61f4921..52d4aae4e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,5 +22,5 @@ task:
     # Due to a race condition that only occurs in the cirrus ci, "make distcheck" has been replaced by "make check".
     #
     ./bootstrap &&
-    ./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=yes --enable-tcti-libtpms=no --enable-tcti-mssim=no --enable-nodl --disable-dependency-tracking &&
+    ./configure --enable-self-generated-certificate --enable-unit=yes --enable-integration=yes --with-crypto=ossl --disable-doxygen-doc --enable-tcti-swtpm=yes --enable-tcti-libtpms=no --enable-tcti-mssim=no --disable-dependency-tracking &&
     gmake -j check || { cat /tmp/cirrus-ci-build/tpm2-tss-*/_build/sub/test-suite.log; exit 1; }
diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4
index 048c536fc..d4e51fdd2 100644
--- a/m4/ld-version-script.m4
+++ b/m4/ld-version-script.m4
@@ -26,20 +26,14 @@ AC_DEFUN([gl_LD_VERSION_SCRIPT],
        [gl_cv_sys_ld_version_script=no
         save_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-        echo foo >conftest.map
+        echo "{ global: *; };" > conftest.map
         AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-          [],
-          [cat > conftest.map <<EOF
-VERS_1 {
-        global: sym;
-};
-
-VERS_2 {
-        global: sym;
-} VERS_1;
-EOF
-           AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-             [gl_cv_sys_ld_version_script=yes])])
+          [gl_cv_sys_ld_version_script=yes],
+          [gl_cv_sys_ld_version_script=no])
+        echo foo > conftest.map
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+          [gl_cv_sys_ld_version_script=no],
+          [])
         rm -f conftest.map
         LDFLAGS=$save_LDFLAGS])
      have_ld_version_script=$gl_cv_sys_ld_version_script])