diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2021-07-12 12:59:51 +0100 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2021-07-12 13:26:24 +0100 |
| commit | c9b822a38d0e71539ab4fef429027ec11f75e3b6 (patch) | |
| tree | b1d85883a2a259cefd2b13fe14d4c21edb166f02 /media-sound/aqualung | |
| parent | media-sound/aqualung: fix REQUIRED_USE for USE=lua (diff) | |
| download | gentoo-c9b822a38d0e71539ab4fef429027ec11f75e3b6.tar.gz gentoo-c9b822a38d0e71539ab4fef429027ec11f75e3b6.tar.bz2 gentoo-c9b822a38d0e71539ab4fef429027ec11f75e3b6.zip | |
media-sound/aqualung: respect LUA_SINGLE_TARGET value
Default upstream behaviour is to prefer 5.2 over all others if
present, and if neither 5.2 nor 5.1 can be found try the newest version
available.
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'media-sound/aqualung')
| -rw-r--r-- | media-sound/aqualung/aqualung-1.1-r101.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch | 31 |
2 files changed, 37 insertions, 0 deletions
diff --git a/media-sound/aqualung/aqualung-1.1-r101.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild index 3f49bddce792..af782eb70152 100644 --- a/media-sound/aqualung/aqualung-1.1-r101.ebuild +++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild @@ -55,6 +55,7 @@ DEPEND=" " PATCHES=( + "${FILESDIR}/${P}-configure-lua-version.patch" "${FILESDIR}/${P}-ifp.patch" "${FILESDIR}/${P}-var-collision.patch" ) @@ -63,6 +64,11 @@ pkg_setup() { use lua && lua-single_pkg_setup } +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ --disable-rpath \ diff --git a/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch new file mode 100644 index 000000000000..a88839728c53 --- /dev/null +++ b/media-sound/aqualung/files/aqualung-1.1-configure-lua-version.patch @@ -0,0 +1,31 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -401,24 +401,11 @@ + ]) + + AQUALUNG_DETECT([lua], [Lua Extension], +- [PKG_CHECK_MODULES([lua], [lua5.2], ++ [PKG_CHECK_MODULES([lua], [lua], + [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua-5.2], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua52], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua5.1], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua-5.1], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua51], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua >= 5.2], +- [AQUALUNG_FOUND([lua])], +- [PKG_CHECK_MODULES([lua], [lua >= 5.1], +- [AQUALUNG_FOUND([lua])], +- [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])])])])])])])])])]) +- ++ [AQUALUNG_MISSING([lua], [$lua_PKG_ERRORS])] ++ )] ++) + + # Compiler and linker variables. + AS_VAR_IF([GCC], [yes], [CFLAGS="-Wall $CFLAGS"]) |