From dc95d50fe3ee4dc72f19f838f9c05fec75973140 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 1 Feb 2016 17:02:06 +0100 Subject: [PATCH] package/Makefile.in: correct gettext handling for musl Based on a patch by Bernd Kuhls. The AM_GNU_GETTEXT autotools macro misdetects musl gettext support as it checks for internal glibc symbols. Work around it by forcing libc gettext support when musl is used for the supported gettext api levels. As this is a generic issue for any package using AM_GNU_GETTEXT, add it to the global TARGET_CONFIGURE_ARGS instead of for each affected package. Signed-off-by: Peter Korsgaard --- package/Makefile.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/package/Makefile.in b/package/Makefile.in index c5652af0f7..96d93b07a9 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -340,6 +340,15 @@ else BR2_AC_CV_C_BIGENDIAN = ac_cv_c_bigendian=no endif +# AM_GNU_GETTEXT misdetects musl gettext support. +# musl currently implements api level 1 and 2 (basic + ngettext) +# http://www.openwall.com/lists/musl/2015/04/16/3 +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +BR2_GT_CV_FUNC_GNUGETTEXT_LIBC = \ + gt_cv_func_gnugettext1_libc=yes + gt_cv_func_gnugettext2_libc=yes +endif + TARGET_CONFIGURE_ARGS = \ $(BR2_AC_CV_TRAP_CHECK) \ ac_cv_func_mmap_fixed_mapped=yes \ @@ -350,7 +359,8 @@ TARGET_CONFIGURE_ARGS = \ ac_cv_func_calloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ lt_cv_sys_lib_search_path_spec="" \ - $(BR2_AC_CV_C_BIGENDIAN) + $(BR2_AC_CV_C_BIGENDIAN) \ + $(BR2_GT_CV_FUNC_GNUGETTEXT_LIBC) ################################################################################ -- 2.30.2