From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 202B31382C5 for ; Tue, 22 Dec 2020 15:08:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDC16E0982; Tue, 22 Dec 2020 15:08:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDC67E0963 for ; Tue, 22 Dec 2020 15:08:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54E0F341009 for ; Tue, 22 Dec 2020 15:08:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D52984E for ; Tue, 22 Dec 2020 15:08:15 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1608649684.a01ac96b8f18c783c97ab7a25b9c5914f1250077.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/luv/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lua/luv/luv-1.32.0.0-r101.ebuild dev-lua/luv/luv-1.32.0.0-r102.ebuild X-VCS-Directories: dev-lua/luv/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: a01ac96b8f18c783c97ab7a25b9c5914f1250077 X-VCS-Branch: master Date: Tue, 22 Dec 2020 15:08:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 425f1767-0ad0-4f87-ada8-c9e75321bb4e X-Archives-Hash: 9000a0e54dfc2e67f139f731d5a10736 commit: a01ac96b8f18c783c97ab7a25b9c5914f1250077 Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 22 14:24:25 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Dec 22 15:08:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01ac96b dev-lua/luv: go back to single-impl mode The only revdep currently in the tree, app-editors/neovim, actually links against luv instead of loading it as a module. Between that and upstream not actually supporting multi-impl installations, why bother. Signed-off-by: Marek Szuba gentoo.org> ...32.0.0-r101.ebuild => luv-1.32.0.0-r102.ebuild} | 51 +++++----------------- 1 file changed, 10 insertions(+), 41 deletions(-) diff --git a/dev-lua/luv/luv-1.32.0.0-r101.ebuild b/dev-lua/luv/luv-1.32.0.0-r102.ebuild similarity index 56% rename from dev-lua/luv/luv-1.32.0.0-r101.ebuild rename to dev-lua/luv/luv-1.32.0.0-r102.ebuild index f45e0eee282..7b4e0feb5b7 100644 --- a/dev-lua/luv/luv-1.32.0.0-r101.ebuild +++ b/dev-lua/luv/luv-1.32.0.0-r102.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..4} luajit ) -inherit cmake lua unpacker +inherit cmake lua-single unpacker # e.g. MY_PV = a.b.c-d MY_PV="$(ver_rs 3 -)" @@ -46,11 +46,16 @@ src_prepare() { cmake_src_prepare } -lua_src_configure() { +# 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=( - -DINSTALL_LIB_DIR="$(lua_get_cmod_dir)" -DBUILD_MODULE=OFF -DLUA_BUILD_TYPE=System -DLUA_COMPAT53_DIR="${lua_compat_dir}" @@ -70,44 +75,8 @@ lua_src_configure() { cmake_src_configure } -lua_src_test() { - # We need to copy the implementation-specific library back so that the tests see it - rm -f ./luv.so +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" } - -lua_src_install() { - cmake_src_install - mkdir -p "${ED}"/usr/$(get_libdir)/pkgconfig && \ - mv "${ED}$(lua_get_cmod_dir)"/pkgconfig/libluv.pc \ - "${ED}"/usr/$(get_libdir)/pkgconfig/libluv-${ELUA}.pc || \ - die "Failed make pkgconfig file for ${ELUA} implementation-specific" - rmdir "${ED}$(lua_get_cmod_dir)"/pkgconfig || die -} - -src_configure() { - lua_foreach_impl lua_src_configure -} - -src_compile() { - lua_foreach_impl cmake_src_compile -} - -src_test() { - lua_foreach_impl lua_src_test -} - -src_install() { - lua_foreach_impl lua_src_install -} - -pkg_postinst() { - ewarn "Please note that in order to properly support multiple Lua implementations," - ewarn "this ebuild of ${PN} installs its library files into implementation-specific" - ewarn "module directories, as well as multiple .pc files named after implementations" - ewarn "(e.g. 'libluv-lua5.3.pc'). Since upstream by default only supports a single" - ewarn "Lua implementation at a time and thus only provides a single, unversioned" - ewarn ".pc file, projects depending on ${PN} might require changes in order to" - ewarn "support the multi-implementation approach." -}