From: Grisha Levit Date: Tue, 29 Jul 2025 21:36:30 +0000 (-0400) Subject: build: fix macOS build without libintl X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b111d02740bd45b847f5385988f94334bc7bc17;p=thirdparty%2Fcoreutils.git build: fix macOS build without libintl A more precise fix than commit v9.7-322-gc2e1816a5 * configure.ac (USE_NLS): new AM_CONDITIONAL. * src/local.mk: add @INTL_MACOSX_LIBS@ to _LDADD that need it. --- diff --git a/configure.ac b/configure.ac index fd0b11a69a..5e99ef386c 100644 --- a/configure.ac +++ b/configure.ac @@ -886,13 +886,13 @@ AC_SUBST([EXTRA_MANS]) AM_SUBST_NOTMAKE([EXTRA_MANS]) AC_SUBST([built_programs], [$optional_bin_progs]) AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) - ############################################################################ # As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in # translatable strings, we must use need-formatstring-macros here. AM_GNU_GETTEXT([external], [need-formatstring-macros]) AM_GNU_GETTEXT_VERSION([0.19.2]) +AM_CONDITIONAL([USE_NLS], [test "$USE_NLS" = yes]) # For a test of uniq: it uses the $LOCALE_FR envvar. gt_LOCALE_FR diff --git a/src/local.mk b/src/local.mk index a55c9f990a..14f4d0c13f 100644 --- a/src/local.mk +++ b/src/local.mk @@ -337,6 +337,16 @@ src_sort_LDADD += $(LIBPMULTITHREAD) # for pthread_sigmask src_sort_LDADD += $(PTHREAD_SIGMASK_LIB) +if !USE_NLS +# for CFPreferencesCopyAppValue +src_date_LDADD += $(INTL_MACOSX_LIBS) +src_du_LDADD += $(INTL_MACOSX_LIBS) +src_ls_LDADD += $(INTL_MACOSX_LIBS) +src_pr_LDADD += $(INTL_MACOSX_LIBS) +src_stat_LDADD += $(INTL_MACOSX_LIBS) +src_uptime_LDADD += $(INTL_MACOSX_LIBS) +endif + # Get the release year from lib/version-etc.c. RELEASE_YEAR = \ `sed -n '/.*COPYRIGHT_YEAR = \([0-9][0-9][0-9][0-9]\) };/s//\1/p' \