diff options
| author | Tianyang Zhou <qsdrqs@gmail.com> | 2022-05-31 18:25:56 -0700 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-06-01 03:15:00 +0100 |
| commit | 2f06c41edaa2b6454f430ca85511f25af26c314b (patch) | |
| tree | cf9e757484179d7f2005161b588e77b5dfddf914 | |
| parent | c401269e5d01422852304a01133cdcde9c9706fc (diff) | |
| download | gentoo-2f06c41edaa2b6454f430ca85511f25af26c314b.tar.gz gentoo-2f06c41edaa2b6454f430ca85511f25af26c314b.tar.bz2 gentoo-2f06c41edaa2b6454f430ca85511f25af26c314b.zip | |
app-editors/neovim: fix lua patch for neovim git
Signed-off-by: Tianyang Zhou <qsdrqs@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25714
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | app-editors/neovim/files/neovim-9999-cmake_lua_version.patch | 11 | ||||
| -rw-r--r-- | app-editors/neovim/neovim-9999.ebuild | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch new file mode 100644 index 000000000000..d7e01275fb02 --- /dev/null +++ b/app-editors/neovim/files/neovim-9999-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -384,7 +384,7 @@ + option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) + + if(PREFER_LUA) +- find_package(Lua 5.1 EXACT REQUIRED) ++ find_package(Lua ${PREFER_LUA} EXACT REQUIRED) + set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) + set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) + # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index f23e7434577b..4316da6d93cc 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -67,10 +67,14 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" ) +if [[ ${PV} == 9999 ]]; then + PATCHES+=("${FILESDIR}/${PN}-9999-cmake_lua_version.patch") +else + PATCHES+=("${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch") +fi src_prepare() { # Use our system vim dir |