From: Bruno Haible <bruno@clisp.org>
Date: Tue, 2 Sep 2025 14:08:16 +0000 (+0200)
Subject: tests: Fix potential link errors.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=114aaaae8acc45142bf7bcda9227f2d0b61bad96;p=thirdparty%2Fgnulib.git

tests: Fix potential link errors.

* modules/mbiter-bench-tests (Makefile.am): Link the benchmark program
with $(LIBICONV).
* modules/mbiterf-bench-tests (Makefile.am): Likewise.
* modules/mbuiter-bench-tests (Makefile.am): Likewise.
* modules/mbuiterf-bench-tests (Makefile.am): Likewise.
* modules/mcel-bench-tests (Makefile.am): Likewise.
* modules/mbswidth-bench-tests (Makefile.am): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index ebf3d3946b..b84aa6a86d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2025-09-02  Bruno Haible  <bruno@clisp.org>
+
+	tests: Fix potential link errors.
+	* modules/mbiter-bench-tests (Makefile.am): Link the benchmark program
+	with $(LIBICONV).
+	* modules/mbiterf-bench-tests (Makefile.am): Likewise.
+	* modules/mbuiter-bench-tests (Makefile.am): Likewise.
+	* modules/mbuiterf-bench-tests (Makefile.am): Likewise.
+	* modules/mcel-bench-tests (Makefile.am): Likewise.
+	* modules/mbswidth-bench-tests (Makefile.am): Likewise.
+
 2025-09-02  Bruno Haible  <bruno@clisp.org>
 
 	Clarify link dependency towards libiconv.
diff --git a/modules/mbiter-bench-tests b/modules/mbiter-bench-tests
index 03ca077470..ec22673d1a 100644
--- a/modules/mbiter-bench-tests
+++ b/modules/mbiter-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbiter
 bench_mbiter_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)
diff --git a/modules/mbiterf-bench-tests b/modules/mbiterf-bench-tests
index 52106aad33..b4b530dc5a 100644
--- a/modules/mbiterf-bench-tests
+++ b/modules/mbiterf-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbiterf
 bench_mbiterf_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)
diff --git a/modules/mbswidth-bench-tests b/modules/mbswidth-bench-tests
index 2f3e449e99..f8edf91dfe 100644
--- a/modules/mbswidth-bench-tests
+++ b/modules/mbswidth-bench-tests
@@ -19,4 +19,4 @@ noinst_PROGRAMS += bench-mbswidth
 # global CPPFLAGS. For complete removal of assert() invocations, pass
 # CPPFLAGS="-DNDEBUG" when configuring the package.
 bench_mbswidth_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbswidth_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbswidth_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)
diff --git a/modules/mbuiter-bench-tests b/modules/mbuiter-bench-tests
index ad2d0169df..de98778fd6 100644
--- a/modules/mbuiter-bench-tests
+++ b/modules/mbuiter-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbuiter
 bench_mbuiter_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbuiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbuiter_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)
diff --git a/modules/mbuiterf-bench-tests b/modules/mbuiterf-bench-tests
index d29e19edb5..cf806ecc49 100644
--- a/modules/mbuiterf-bench-tests
+++ b/modules/mbuiterf-bench-tests
@@ -16,4 +16,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mbuiterf
 bench_mbuiterf_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mbuiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mbuiterf_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)
diff --git a/modules/mcel-bench-tests b/modules/mcel-bench-tests
index ea64a2f60c..0c54aad819 100644
--- a/modules/mcel-bench-tests
+++ b/modules/mcel-bench-tests
@@ -20,4 +20,4 @@ configure.ac:
 Makefile.am:
 noinst_PROGRAMS += bench-mcel
 bench_mcel_CPPFLAGS = $(AM_CPPFLAGS) -DNDEBUG
-bench_mcel_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV)
+bench_mcel_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBC32CONV) $(LIBICONV)