commit: b76f3a0c56fd50eaf4272ea78bb9283a533710c0 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Jun 24 18:33:08 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Jun 24 18:33:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76f3a0c
sys-devel/gettext-0.22-r1: fix non-Linux targets Closes: https://bugs.gentoo.org/909041 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> .../files/gettext-0.22-disable-libintl.patch | 34 ++++++++++++++++++++++ ...{gettext-0.22.ebuild => gettext-0.22-r1.ebuild} | 1 + 2 files changed, 35 insertions(+) diff --git a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch new file mode 100644 index 000000000000..b242ead4b435 --- /dev/null +++ b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/564168 +https://bugs.gentoo.org/909041 + +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 +@@ -22765,9 +22765,7 @@ + + 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 \ +- && test "$PACKAGE" != libintl; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= +--- a/gettext-tools/configure ++++ b/gettext-tools/configure +@@ -26129,9 +26129,7 @@ + + 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 \ +- && test "$PACKAGE" != libintl; }; then ++ }; then + gt_use_preinstalled_gnugettext=yes + else + LIBINTL= diff --git a/sys-devel/gettext/gettext-0.22.ebuild b/sys-devel/gettext/gettext-0.22-r1.ebuild similarity index 99% rename from sys-devel/gettext/gettext-0.22.ebuild rename to sys-devel/gettext/gettext-0.22-r1.ebuild index 58592b47a9e6..15b71238987e 100644 --- a/sys-devel/gettext/gettext-0.22.ebuild +++ b/sys-devel/gettext/gettext-0.22-r1.ebuild @@ -67,6 +67,7 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( + "${FILESDIR}"/${PN}-0.22-disable-libintl.patch "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch )
