]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
configure: additionally get icu-uc from pkg-config
authorAlyssa Ross <hi@alyssa.is>
Fri, 14 Feb 2025 08:45:10 +0000 (09:45 +0100)
committerAndrey Albershteyn <aalbersh@kernel.org>
Wed, 26 Feb 2025 13:12:30 +0000 (14:12 +0100)
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
Link: https://src.fedoraproject.org/rpms/xfsprogs/c/624b0fdf7b2a31c1a34787b04e791eee47c97340
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
m4/package_icu.m4

index 3ccbe0cc98066b83464d311cade3f20d8f7cecf6..6b89c874f178d6ebe9496af5453a96dd0ce2ba3a 100644 (file)
@@ -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)