> 2025-09-02 Bruno Haible <[email protected]> > > Clarify link dependency towards libintl on FreeBSD, Solaris, etc.
And this patch fixes a similar omission for libiconv. 2025-09-02 Bruno Haible <[email protected]> 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 <[email protected]> Clarify link dependency towards libiconv. * modules/propername (Link): Document requirement to link with $(LIBICONV) or $(LTLIBICONV). * modules/xstriconv (Link): Likewise.
>From 8a61720ae88718316f79625c714b70d7fb13672c Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 2 Sep 2025 16:05:31 +0200 Subject: [PATCH 1/2] Clarify link dependency towards libiconv. * modules/propername (Link): Document requirement to link with $(LIBICONV) or $(LTLIBICONV). * modules/xstriconv (Link): Likewise. --- ChangeLog | 7 +++++++ modules/propername | 1 + modules/xstriconv | 1 + 3 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index c42f89a07e..ebf3d3946b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2025-09-02 Bruno Haible <[email protected]> + + Clarify link dependency towards libiconv. + * modules/propername (Link): Document requirement to link with + $(LIBICONV) or $(LTLIBICONV). + * modules/xstriconv (Link): Likewise. + 2025-09-02 Bruno Haible <[email protected]> getlogin tests: Fix link error on musl libc. diff --git a/modules/propername b/modules/propername index fe9eb20026..427eec7896 100644 --- a/modules/propername +++ b/modules/propername @@ -35,6 +35,7 @@ $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise $(MBRTOWC_LIB) $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise +$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise License: GPL diff --git a/modules/xstriconv b/modules/xstriconv index afe83ab27a..77ebd98d7d 100644 --- a/modules/xstriconv +++ b/modules/xstriconv @@ -20,6 +20,7 @@ Include: Link: $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise +$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise License: GPL -- 2.50.1
>From 114aaaae8acc45142bf7bcda9227f2d0b61bad96 Mon Sep 17 00:00:00 2001 From: Bruno Haible <[email protected]> Date: Tue, 2 Sep 2025 16:08:16 +0200 Subject: [PATCH 2/2] 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. --- ChangeLog | 11 +++++++++++ modules/mbiter-bench-tests | 2 +- modules/mbiterf-bench-tests | 2 +- modules/mbswidth-bench-tests | 2 +- modules/mbuiter-bench-tests | 2 +- modules/mbuiterf-bench-tests | 2 +- modules/mcel-bench-tests | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ebf3d3946b..b84aa6a86d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2025-09-02 Bruno Haible <[email protected]> + + 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 <[email protected]> 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) -- 2.50.1
