commit: 7006ca35680e9aa14f4e5f4bbf3b30f03d5b38d6 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Wed Jun 15 20:14:58 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Wed Jun 15 20:15:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7006ca35
sys-devel/gettext: make sure libintl building is disabled #564168 .../files/gettext-0.19.7-disable-libintl.patch | 30 ++++++++++++++++++++++ sys-devel/gettext/gettext-0.19.7.ebuild | 2 ++ sys-devel/gettext/gettext-0.19.8.1.ebuild | 2 ++ 3 files changed, 34 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 new file mode 100644 index 0000000..f51de34 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.19.7-disable-libintl.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/564168 +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/configure ++++ b/gettext-runtime/configure +@@ -20391,8 +20391,7 @@ $as_echo "$ac_res" >&6; } + + 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 + LIBINTL= +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -22746,8 +22746,7 @@ $as_echo "$ac_res" >&6; } + + 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 + LIBINTL= diff --git a/sys-devel/gettext/gettext-0.19.7.ebuild b/sys-devel/gettext/gettext-0.19.7.ebuild index 962433a..7922b1d 100644 --- a/sys-devel/gettext/gettext-0.19.7.ebuild +++ b/sys-devel/gettext/gettext-0.19.7.ebuild @@ -49,6 +49,8 @@ pkg_setup() { src_prepare() { java-pkg-opt-2_src_prepare + epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 + epunt_cxx elibtoolize } diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild b/sys-devel/gettext/gettext-0.19.8.1.ebuild index 165bf05..d49716f 100644 --- a/sys-devel/gettext/gettext-0.19.8.1.ebuild +++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild @@ -49,6 +49,8 @@ pkg_setup() { src_prepare() { java-pkg-opt-2_src_prepare + epatch "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 + epunt_cxx elibtoolize }
