[pkgsrc/trunk]: pkgsrc/devel/gettext-lib gettext-lib: fix built-in gettext de...

[mcf <mcf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/89166098afea
branches:  trunk
changeset: 440702:89166098afea
user:      mcf <mcf%pkgsrc.org@localhost>
date:      Thu Oct 15 23:32:07 2020 +0000

description:
gettext-lib: fix built-in gettext detection on musl

Some packages, for example GNU sed, still use old versions of
gettext.m4 (serial 67 or older) despite having recent releases.

These versions of gettext.m4 fail to detect gettext on musl, which
has gettext built-in to libc. While there is some logic in
gettext-lib/builtin.mk for this situation, it only covers the case
where libintl is separate from libc. To fix this, set the corresponding
configure variables when gettext is built-in to libc.

diffstat:

 devel/gettext-lib/builtin.mk |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 169c1453e231 -r 89166098afea devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk      Thu Oct 15 23:30:04 2020 +0000
+++ b/devel/gettext-lib/builtin.mk      Thu Oct 15 23:32:07 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.48 2019/11/03 10:39:12 rillig Exp $
+# $NetBSD: builtin.mk,v 1.49 2020/10/15 23:32:07 mcf Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -127,6 +127,13 @@
            empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*)
 CONFIGURE_ENV+=                gt_cv_func_gnugettext2_libintl="yes"
 .        endif
+.      else
+CONFIGURE_ENV+=                gt_cv_func_gnugettext_libc="yes"
+CONFIGURE_ENV+=                gt_cv_func_gnugettext1_libc="yes"
+.        if empty(H_NGETTEXT_GETTEXT:M__nonexistent__) && \
+           empty(H_NGETTEXT_GETTEXT:M${LOCALBASE}/*)
+CONFIGURE_ENV+=                gt_cv_func_gnugettext2_libc="yes"
+.        endif
 .      endif
 .    endif
 .  endif