| 1 |
commit: 2b5acf19be8645e316cdd35f336a9b641a49e684 |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 18 05:08:23 2019 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 18 05:10:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5acf19 |
| 7 |
|
| 8 |
dev-db/redis: GitHub PR dropped slotted-Lua improvements |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-db/redis/redis-4.0.14.ebuild | 21 +++++++++++++++++---- |
| 14 |
dev-db/redis/redis-5.0.4.ebuild | 20 +++++++++++++++++--- |
| 15 |
2 files changed, 34 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/redis/redis-4.0.14.ebuild b/dev-db/redis/redis-4.0.14.ebuild |
| 18 |
index 5f2c18f61cb..08d29146a9b 100644 |
| 19 |
--- a/dev-db/redis/redis-4.0.14.ebuild |
| 20 |
+++ b/dev-db/redis/redis-4.0.14.ebuild |
| 21 |
@@ -71,15 +71,28 @@ src_prepare() { |
| 22 |
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
| 23 |
|
| 24 |
# Use the correct pkgconfig name for Lua |
| 25 |
- has_version 'dev-lang/lua:5.1' \ |
| 26 |
- && LUAPKGCONFIG=lua5.1 \ |
| 27 |
- || LUAPKGCONFIG=lua |
| 28 |
+ if false && has_version 'dev-lang/lua:5.3'; then |
| 29 |
+ # Lua5.3 gives: |
| 30 |
+ #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
| 31 |
+ LUAPKGCONFIG=lua5.3 |
| 32 |
+ elif false && has_version 'dev-lang/lua:5.2'; then |
| 33 |
+ # Lua5.2 fails with: |
| 34 |
+ # scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
| 35 |
+ # Because lua_open because lua_newstate in 5.2 |
| 36 |
+ LUAPKGCONFIG=lua5.2 |
| 37 |
+ elif has_version 'dev-lang/lua:5.1'; then |
| 38 |
+ LUAPKGCONFIG=lua5.1 |
| 39 |
+ else |
| 40 |
+ LUAPKGCONFIG=lua |
| 41 |
+ fi |
| 42 |
+ # The upstream configure script handles luajit specially, and is not |
| 43 |
+ # effected by these changes. |
| 44 |
+ einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" |
| 45 |
sed -i \ |
| 46 |
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
| 47 |
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
| 48 |
-e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ |
| 49 |
configure.ac || die "Sed failed for configure.ac" |
| 50 |
- |
| 51 |
eautoreconf |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
diff --git a/dev-db/redis/redis-5.0.4.ebuild b/dev-db/redis/redis-5.0.4.ebuild |
| 56 |
index 519fc3837ca..07c6466e9a1 100644 |
| 57 |
--- a/dev-db/redis/redis-5.0.4.ebuild |
| 58 |
+++ b/dev-db/redis/redis-5.0.4.ebuild |
| 59 |
@@ -71,9 +71,23 @@ src_prepare() { |
| 60 |
cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die |
| 61 |
|
| 62 |
# Use the correct pkgconfig name for Lua |
| 63 |
- has_version 'dev-lang/lua:5.1' \ |
| 64 |
- && LUAPKGCONFIG=lua5.1 \ |
| 65 |
- || LUAPKGCONFIG=lua |
| 66 |
+ if false && has_version 'dev-lang/lua:5.3'; then |
| 67 |
+ # Lua5.3 gives: |
| 68 |
+ #lua_bit.c:83:2: error: #error "Unknown number type, check LUA_NUMBER_* in luaconf.h" |
| 69 |
+ LUAPKGCONFIG=lua5.3 |
| 70 |
+ elif false && has_version 'dev-lang/lua:5.2'; then |
| 71 |
+ # Lua5.2 fails with: |
| 72 |
+ # scripting.c:(.text+0x1f9b): undefined reference to `lua_open' |
| 73 |
+ # Because lua_open because lua_newstate in 5.2 |
| 74 |
+ LUAPKGCONFIG=lua5.2 |
| 75 |
+ elif has_version 'dev-lang/lua:5.1'; then |
| 76 |
+ LUAPKGCONFIG=lua5.1 |
| 77 |
+ else |
| 78 |
+ LUAPKGCONFIG=lua |
| 79 |
+ fi |
| 80 |
+ # The upstream configure script handles luajit specially, and is not |
| 81 |
+ # effected by these changes. |
| 82 |
+ einfo "Selected LUAPKGCONFIG=${LUAPKGCONFIG}" |
| 83 |
sed -i \ |
| 84 |
-e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ |
| 85 |
-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ |
Archives