summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szuba <marecki@gentoo.org>2020-12-04 00:30:30 +0100
committerMarek Szuba <marecki@gentoo.org>2020-12-04 00:40:58 +0100
commitd3f4980a29badde11785f1ea8bebc82c4fbfcd89 (patch)
treed216155b4ddaba8ce00a5b986078ac0b9dbbafb4 /app-admin/lsyncd/files
parentsys-apps/portage: Revbump to 3.0.11-r2 for regression fix (diff)
downloadgentoo-d3f4980a29badde11785f1ea8bebc82c4fbfcd89.tar.gz
gentoo-d3f4980a29badde11785f1ea8bebc82c4fbfcd89.tar.bz2
gentoo-d3f4980a29badde11785f1ea8bebc82c4fbfcd89.zip
app-admin/lsyncd-2.2.3: migrate to lua-single.eclass
Upstream uses a customised variant of a really old version of FindLua.cmake which is not easy to replace with a modern stock version because it sets paths to lua and luac. Fortunately, it was simple enough to patch to only accept one specific ABI version. Was masked to begin with and I have kept the relevant package.mask line where it was. Closes: https://bugs.gentoo.org/752516 Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'app-admin/lsyncd/files')
-rw-r--r--app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
new file mode 100644
index 000000000000..7a6cccb1445d
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.2.3-cmake_lua_version.patch
@@ -0,0 +1,20 @@
+--- a/cmake/FindLua.cmake
++++ b/cmake/FindLua.cmake
+@@ -36,7 +36,7 @@
+ #SET(_POSSIBLE_LUA_LIBRARY lua)
+
+ # Determine possible naming suffixes (there is no standard for this)
+-SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "")
++SET(_POSSIBLE_SUFFIXES "${LUA_ABI_VERSION}")
+
+ # Set up possible search names and locations
+ FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES})
+@@ -53,7 +53,7 @@
+
+ # Find the lua executable
+ FIND_PROGRAM(LUA_COMPILER
+- NAMES luac5.3 ${_POSSIBLE_LUA_COMPILER}
++ NAMES ${_POSSIBLE_LUA_COMPILER}
+ )
+
+ # Find the lua header