CVS commit: pkgsrc/devel/gettext-lib

["Michael Forney" <mcf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mcf
Date:           Thu Oct 15 23:32:07 UTC 2020

Modified Files:
        pkgsrc/devel/gettext-lib: builtin.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/devel/gettext-lib/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gettext-lib/builtin.mk
diff -u pkgsrc/devel/gettext-lib/builtin.mk:1.48 pkgsrc/devel/gettext-lib/builtin.mk:1.49
--- pkgsrc/devel/gettext-lib/builtin.mk:1.48    Sun Nov  3 10:39:12 2019
+++ pkgsrc/devel/gettext-lib/builtin.mk Thu Oct 15 23:32:07 2020
@@ -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 @@ CONFIGURE_ENV+=            gt_cv_func_gnugettext1_
            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