summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2021-03-22 11:06:31 +0100
committerDavid Seifert <soap@gentoo.org>2021-03-22 11:06:31 +0100
commit31e09a87470369955e7fcb7fecd76dd21d187b82 (patch)
tree07b1e93184c94b94106e2dde083dd6bfb42e2daf /media-video/vlc
parentapp-emulation/qemu: fix cross-compiling (diff)
downloadgentoo-31e09a87470369955e7fcb7fecd76dd21d187b82.tar.gz
gentoo-31e09a87470369955e7fcb7fecd76dd21d187b82.tar.bz2
gentoo-31e09a87470369955e7fcb7fecd76dd21d187b82.zip
media-video/vlc: fix gettext version mismatch
Make the specified gettext version the minimum instead of the exact version required. It fixes this error when cross-compiling: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 Closes: https://bugs.gentoo.org/766549 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/vlc-3.0.12.1-r100.ebuild3
-rw-r--r--media-video/vlc/vlc-3.0.9999.ebuild3
-rw-r--r--media-video/vlc/vlc-9999.ebuild3
3 files changed, 9 insertions, 0 deletions
diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
index 41a504e5afa6..4463b83fc271 100644
--- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
@@ -272,6 +272,9 @@ src_prepare() {
sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
eautoreconf
# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index a90d2abdfd4e..ac592d9ad6f4 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -269,6 +269,9 @@ src_prepare() {
sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
eautoreconf
# Disable automatic running of tests.
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 2eec388951d8..cebba4dea7e9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -272,6 +272,9 @@ src_prepare() {
sed -e "/test.*build.*host/s/\$(host)/nothanks/" \
-i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen"
+ # Fix gettext version mismatch errors.
+ sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die
+
eautoreconf
# Disable automatic running of tests.