diff options
| author | Grisha Levit <grishalevit@gmail.com> | 2025-07-29 17:36:30 -0400 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2025-11-01 15:07:13 +0000 |
| commit | 8b111d02740bd45b847f5385988f94334bc7bc17 (patch) | |
| tree | 761affea257b79e5adcfef518014f947b225a971 | |
| parent | maint: ln: eliminate a clang -Wformat-extra-args warning (diff) | |
| download | coreutils-8b111d02740bd45b847f5385988f94334bc7bc17.tar.gz coreutils-8b111d02740bd45b847f5385988f94334bc7bc17.zip | |
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 <prog>_LDADD that need it.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/local.mk | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index fd0b11a69..5e99ef386 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 a55c9f990..14f4d0c13 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' \ |