[xfsprogs,v2] configure: additionally get icu-uc from pkg-config

Commit Message

Alyssa Ross Feb. 14, 2025, 8:45 a.m. UTC

Upstream libicu changed its pkgconfig files[0] in version 76 to require
callers to call out to each .pc file they need for the libraries they
want to link against.  This apparently reduces overlinking, at a cost of
needing the world to fix themselves up.

This patch fixes the following build error with icu 76, also seen by
Fedora[1]:

	    /bin/ld: unicrash.o: undefined reference to symbol 'uiter_setString_76'
	    /bin/ld: /lib/libicuuc.so.76: error adding symbols: DSO missing from command line
	    collect2: error: ld returned 1 exit status
	    make[2]: *** [../include/buildrules:65: xfs_scrub] Error 1
	    make[1]: *** [include/buildrules:35: scrub] Error 2

Link: https://github.com/unicode-org/icu/commit/199bc827021ffdb43b6579d68e5eecf54c7f6f56 [0]
Link: https://src.fedoraproject.org/rpms/xfsprogs/c/624b0fdf7b2a31c1a34787b04e791eee47c97340 [1]
Signed-off-by: Alyssa Ross <[e-mail]>
Reviewed-by: "Darrick J. Wong" <[e-mail]>
---
Changes since v1:

 • Expand patch description with Darrick's suggestion.

v1: https://lore.kernel.org/linux-xfs/[e-mail]/

 m4/package_icu.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 90d6da68ee54e6d4ef99eca4a82cac6036a34b00

Patch

diff --git a/m4/package_icu.m4 b/m4/package_icu.m4
index 3ccbe0cc..6b89c874 100644
--- a/m4/package_icu.m4
+++ b/m4/package_icu.m4
@@ -1,5 +1,5 @@ 
 AC_DEFUN([AC_HAVE_LIBICU],
-  [ PKG_CHECK_MODULES([libicu], [icu-i18n], [have_libicu=yes], [have_libicu=no])
+  [ PKG_CHECK_MODULES([libicu], [icu-i18n icu-uc], [have_libicu=yes], [have_libicu=no])
     AC_SUBST(have_libicu)
     AC_SUBST(libicu_CFLAGS)
     AC_SUBST(libicu_LIBS)