* [gentoo-commits] repo/gentoo:master commit in: dev-lua/luv/files/, dev-lua/luv/
@ 2020-10-13 16:55 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2020-10-13 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 40ae837172c06f2e9532db2b7ee570b966e4e6fb
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 13:04:28 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 16:47:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ae8371
dev-lua/luv: migrate to lua-single.eclass
In theory this should be multi-impl but upstream does not directly support
it, in particular their pkgconfig files do not include the Lua ABI
version in their names. For now just keep it simple i.e. stick with the
old behaviour of only supporting one implementation at a time.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../luv/files/luv-1.32.0.0-cmake_lua_version.patch | 11 +++
dev-lua/luv/luv-1.32.0.0-r100.ebuild | 79 ++++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git a/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
new file mode 100644
index 00000000000..84af757d248
--- /dev/null
+++ b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,7 @@
+ include_directories(${LUAJIT_INCLUDE_DIR})
+ link_directories(${LUAJIT_LIBRARIES})
+ else (USE_LUAJIT)
+- find_package(Lua REQUIRED)
++ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
+ include_directories(${LUA_INCLUDE_DIR})
+ endif (USE_LUAJIT)
+
diff --git a/dev-lua/luv/luv-1.32.0.0-r100.ebuild b/dev-lua/luv/luv-1.32.0.0-r100.ebuild
new file mode 100644
index 00000000000..793fb2104a0
--- /dev/null
+++ b/dev-lua/luv/luv-1.32.0.0-r100.ebuild
@@ -0,0 +1,79 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit cmake lua-single unpacker
+
+# e.g. MY_PV = a.b.c-d
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Bare libuv bindings for lua"
+HOMEPAGE="https://github.com/luvit/luv"
+
+LUA_COMPAT_PV="0.7"
+SRC_URI="
+ https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
+"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="${LUA_DEPS}
+ >=dev-libs/libuv-1.32.0:="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Fix libdir
+ # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
+ sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
+ cmake_src_prepare
+}
+
+# TODO: try to make this multi-impl. Will need at least:
+# - per-implementation install dirs for headers and the library
+# - versioned .pc files (which may or may not break revdeps)
+src_configure() {
+ lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
+
+ local mycmakeargs=(
+ -DBUILD_MODULE=OFF
+ -DLUA_BUILD_TYPE=System
+ -DLUA_COMPAT53_DIR="${lua_compat_dir}"
+ -DWITH_SHARED_LIBUV=ON
+ )
+ if [[ ${ELUA} == luajit ]]; then
+ mycmakeargs+=(
+ -DWITH_LUA_ENGINE=LuaJIT
+ )
+ else
+ mycmakeargs+=(
+ -DWITH_LUA_ENGINE=Lua
+ -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ # We need to copy the library back so that the tests see it
+ ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
+ ${ELUA} "tests/run.lua" || die "Tests failed"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lua/luv/files/, dev-lua/luv/
@ 2023-09-04 18:54 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2023-09-04 18:54 UTC (permalink / raw
To: gentoo-commits
commit: aa0516fc4011e1134e6bf46aa46410f149748b62
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 4 18:13:30 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 4 18:54:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0516fc
dev-lua/luv: drop 1.36.0.0, 1.43.0.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-lua/luv/Manifest | 2 -
.../luv/files/luv-1.32.0.0-cmake_lua_version.patch | 11 ---
dev-lua/luv/luv-1.36.0.0.ebuild | 86 ----------------------
dev-lua/luv/luv-1.43.0.0.ebuild | 86 ----------------------
4 files changed, 185 deletions(-)
diff --git a/dev-lua/luv/Manifest b/dev-lua/luv/Manifest
index 9ce5a28f6deb..1c197e845855 100644
--- a/dev-lua/luv/Manifest
+++ b/dev-lua/luv/Manifest
@@ -1,4 +1,2 @@
-DIST luv-1.36.0.0.tar.gz 107196 BLAKE2B 31a02c3e928559037355186810187299a3cb1420265a27756b0613781621c78c18edc272072cc29c46336787b040453cc9a06195264c0a72a985e49c48202022 SHA512 3119c1450a8317725d59cc1ab6afccfbde752b0c32b38909dfdd31bf88ea0751920dc68750da52cf17a6430637cf1094f4d5500e4c50d1145eca48bb12728ba1
-DIST luv-1.43.0.0.tar.gz 122337 BLAKE2B 435334d869487de38215ce9b551f586d4017c7f83497bc90637fc8acb8e63d1c36f6678a3f2c4d5b24b76fd904b2fa8c364a31bc1bd544416f60f2b8290903d3 SHA512 f51d9b3c733dd5617fca49534fdd77dbb6a3d6f58263f453db8dcde21679f4a471e15d6f5b05bcb22a2552455df8beb238d33b0999306bf2a5ad6755da4044ff
DIST luv-1.44.2.0.tar.gz 124180 BLAKE2B 0a46ffccd67bf04fb60c7aa3685fef328da1323437640a04b36748680aaf4074300097c53206915d8a1133defc61a359cd88062f1661899dfa8c394c183f0d0d SHA512 0744590de941ec67e23e04811ed28de5e5ed8b6dd0d45e52e8e0efe0551d007f28cdada8e0d69e0d59bd37d4026102271a8ef977b12cfac1e84f6c8b57e6adce
DIST luv-lua-compat-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
diff --git a/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch b/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
deleted file mode 100644
index 84af757d248b..000000000000
--- a/dev-lua/luv/files/luv-1.32.0.0-cmake_lua_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,7 +107,7 @@
- include_directories(${LUAJIT_INCLUDE_DIR})
- link_directories(${LUAJIT_LIBRARIES})
- else (USE_LUAJIT)
-- find_package(Lua REQUIRED)
-+ find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
- include_directories(${LUA_INCLUDE_DIR})
- endif (USE_LUAJIT)
-
diff --git a/dev-lua/luv/luv-1.36.0.0.ebuild b/dev-lua/luv/luv-1.36.0.0.ebuild
deleted file mode 100644
index 676af8b3f60e..000000000000
--- a/dev-lua/luv/luv-1.36.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake flag-o-matic lua-single unpacker
-
-# e.g. MY_PV = a.b.c-d
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Bare libuv bindings for lua"
-HOMEPAGE="https://github.com/luvit/luv"
-
-LUA_COMPAT_PV="0.10"
-SRC_URI="
- https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="${LUA_DEPS}
- >=dev-libs/libuv-1.32.0:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.32.0.0-cmake_lua_version.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # Fix libdir
- # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
- sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
- cmake_src_prepare
-}
-
-# This could in theory be multi-impl (and we have an ebuild in git history,
-# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
-# app-editors/neovim, actually links against luv instead of trying to load it
-# as a module. We could probably implement some sort of a hack for this
-# - but given how messy it would be, don't bother unless someone actually requests
-# luv multi-impl support.
-src_configure() {
- lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
-
- local mycmakeargs=(
- -DBUILD_MODULE=OFF
- -DLUA_BUILD_TYPE=System
- -DLUA_COMPAT53_DIR="${lua_compat_dir}"
- -DWITH_SHARED_LIBUV=ON
- )
- if [[ ${ELUA} == luajit ]]; then
- mycmakeargs+=(
- -DWITH_LUA_ENGINE=LuaJIT
- )
- else
- mycmakeargs+=(
- -DWITH_LUA_ENGINE=Lua
- -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
- )
- fi
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- append-ldflags "-undefined dynamic_lookup"
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- # We need to copy the library back so that the tests see it
- ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
- ${ELUA} "tests/run.lua" || die "Tests failed"
-}
diff --git a/dev-lua/luv/luv-1.43.0.0.ebuild b/dev-lua/luv/luv-1.43.0.0.ebuild
deleted file mode 100644
index ecf9d1005400..000000000000
--- a/dev-lua/luv/luv-1.43.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake flag-o-matic lua-single unpacker
-
-# e.g. MY_PV = a.b.c-d
-MY_PV="$(ver_rs 3 -)"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Bare libuv bindings for lua"
-HOMEPAGE="https://github.com/luvit/luv"
-
-LUA_COMPAT_PV="0.10"
-SRC_URI="
- https://github.com/luvit/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
- https://github.com/keplerproject/lua-compat-5.3/archive/v${LUA_COMPAT_PV}.tar.gz -> ${PN}-lua-compat-${LUA_COMPAT_PV}.tar.gz
-"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="${LUA_DEPS}
- >=dev-libs/libuv-1.32.0:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.43.0.0-cmake_lua_version.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- # Fix libdir
- # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
- sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
- cmake_src_prepare
-}
-
-# This could in theory be multi-impl (and we have an ebuild in git history,
-# 1.32.0.0-r101, which implements it) - the only revdep currently in the tree,
-# app-editors/neovim, actually links against luv instead of trying to load it
-# as a module. We could probably implement some sort of a hack for this
-# - but given how messy it would be, don't bother unless someone actually requests
-# luv multi-impl support.
-src_configure() {
- lua_compat_dir="${WORKDIR}/lua-compat-5.3-${LUA_COMPAT_PV}"
-
- local mycmakeargs=(
- -DBUILD_MODULE=OFF
- -DLUA_BUILD_TYPE=System
- -DLUA_COMPAT53_DIR="${lua_compat_dir}"
- -DWITH_SHARED_LIBUV=ON
- )
- if [[ ${ELUA} == luajit ]]; then
- mycmakeargs+=(
- -DWITH_LUA_ENGINE=LuaJIT
- )
- else
- mycmakeargs+=(
- -DWITH_LUA_ENGINE=Lua
- -DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
- )
- fi
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- append-ldflags "-undefined dynamic_lookup"
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- # We need to copy the library back so that the tests see it
- ln -s "${BUILD_DIR}/libluv.so" "./luv.so" || die "Failed to symlink library for tests"
- ${ELUA} "tests/run.lua" || die "Tests failed"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-04 18:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-04 18:54 [gentoo-commits] repo/gentoo:master commit in: dev-lua/luv/files/, dev-lua/luv/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-10-13 16:55 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox