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 ACC341382C5 for ; Tue, 9 Mar 2021 18:55:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA2F1E085E; Tue, 9 Mar 2021 18:55:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 B4177E085E for ; Tue, 9 Mar 2021 18:55:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CD3DA33E622 for ; Tue, 9 Mar 2021 18:55:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5540A487 for ; Tue, 9 Mar 2021 18:55:23 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1615316119.845521d116e91e6ed9c0f048ef2744486e626b0a.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/LuaBitOp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild X-VCS-Directories: dev-lua/LuaBitOp/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 845521d116e91e6ed9c0f048ef2744486e626b0a X-VCS-Branch: master Date: Tue, 9 Mar 2021 18:55:23 +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: 5940b9f2-1f3a-4268-b5f6-9ea6af0ba12a X-Archives-Hash: 1597cdb31da7647103e2e264747e2940 commit: 845521d116e91e6ed9c0f048ef2744486e626b0a Author: Aaron Bauman gentoo org> AuthorDate: Tue Mar 9 18:54:29 2021 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Tue Mar 9 18:55:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=845521d1 dev-lua/LuaBitOp: fix build on Darwin; keyword ~x64-macos Signed-off-by: Aaron Bauman gentoo.org> dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild index 617860f3937..7aff8d1d405 100644 --- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild +++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r102.ebuild @@ -5,7 +5,7 @@ EAPI=7 LUA_COMPAT=( lua5-{1..2} luajit ) -inherit lua toolchain-funcs +inherit flag-o-matic lua toolchain-funcs DESCRIPTION="Bit Operations Library for the Lua Programming Language" HOMEPAGE="http://bitop.luajit.org" @@ -13,7 +13,7 @@ SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x64-macos" IUSE="test" REQUIRED_USE="${LUA_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -45,6 +45,9 @@ lua_src_compile() { } src_compile() { + if [[ $CHOST == *-darwin* ]] ; then + append-ldflags "-undefined dynamic_lookup" + fi lua_foreach_impl lua_src_compile } @@ -77,6 +80,14 @@ lua_src_install() { doexe bit.so popd + + if [[ ${CHOST} == *-darwin* ]] ; then + local luav=$(lua_get_version) + # we only want the major version (e.g. 5.1) + local luamv=${luav:0:3} + local file="lua/${luamv}/bit.so" + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name" + fi } src_install() {