commit:     c4451b76dc4f269b5ce467fb3f8fa888bb202ac5
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  5 20:52:50 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec  5 20:52:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c4451b76

sys-devel/gettext-0.21: really disable libintl building

make sure when we rebuild configure we also keep the disabling of
libintl, however, while this works, it triggers am-maintainer mode, and
we should figure out why stuff is regenerated before lifting the 0.21
mask

Package-Manager: Portage-3.0.10.3-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch 
b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
index f51de34843..aa1b5adb13 100644
--- a/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
+++ b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch
@@ -4,6 +4,18 @@ Never build libintl since it's in dev-libs/libintl now.
 We can drop this if/when upstream fixes the configure flag handling:
 https://savannah.gnu.org/bugs/?48233
 
+--- a/gettext-runtime/m4/gettext.m4
++++ b/gettext-runtime/m4/gettext.m4
+@@ -251,8 +251,7 @@
+         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = 
"yes"; } \
+            || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" 
= "yes"; } \
+-                && test "$PACKAGE" != gettext-runtime \
+-                && test "$PACKAGE" != gettext-tools; }; then
++                }; then
+           gt_use_preinstalled_gnugettext=yes
+         else
+           dnl Reset the values set by searching for libintl.
 --- a/gettext-runtime/configure
 +++ b/gettext-runtime/configure
 @@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; }

Reply via email to