diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2023-06-25 11:34:12 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2023-06-25 11:37:25 +0200 |
| commit | 0b876c3fda58c3a1d901ac0ad2dd2f515eb363ea (patch) | |
| tree | 70510ec848d59b016d70895069001c4145a9b91e | |
| parent | dev-ruby/time: Stabilize 0.2.2 x86, #909121 (diff) | |
| download | gentoo-0b876c3fda58c3a1d901ac0ad2dd2f515eb363ea.tar.gz gentoo-0b876c3fda58c3a1d901ac0ad2dd2f515eb363ea.tar.bz2 gentoo-0b876c3fda58c3a1d901ac0ad2dd2f515eb363ea.zip | |
sys-devel/gettext-0.22-r1: take more future-proof route against libintl
Patching configure only is brittle (what if one autoreconfs) and the
whole of it is wired to insist on building libintl (upstreams says in
order to test) so, instead of trying to avoid building libintl (yes,
it's a shame we have to waste cycles on it) just remove the library
after install. This should be cleaner given we have no patch to
maintain (that can get outdated) and just makes the implementation a
one-liner.
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rw-r--r-- | sys-devel/gettext/files/gettext-0.22-disable-libintl.patch | 34 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.22-r1.ebuild | 4 |
2 files changed, 3 insertions, 35 deletions
diff --git a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch b/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch deleted file mode 100644 index b242ead4b435..000000000000 --- a/sys-devel/gettext/files/gettext-0.22-disable-libintl.patch +++ /dev/null @@ -1,34 +0,0 @@ -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-r1.ebuild b/sys-devel/gettext/gettext-0.22-r1.ebuild index 15b71238987e..a1e27860f3f0 100644 --- a/sys-devel/gettext/gettext-0.22-r1.ebuild +++ b/sys-devel/gettext/gettext-0.22-r1.ebuild @@ -67,7 +67,6 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - "${FILESDIR}"/${PN}-0.22-disable-libintl.patch "${FILESDIR}"/${PN}-0.21-CVE-2020-12825.patch ) @@ -153,6 +152,9 @@ multilib_src_install() { dosym msgfmt /usr/bin/gmsgfmt # bug #43435 dobin gettext-tools/misc/gettextize fi + + # 909041 never install libintl which upstream insists on building + rm -f "${ED}"/usr/$(get_libdir)/libintl.* } multilib_src_install_all() { |