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 BC2701382C5 for ; Tue, 9 Mar 2021 18:22:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E49D9E0830; Tue, 9 Mar 2021 18:22:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 CA9F7E0830 for ; Tue, 9 Mar 2021 18:22:10 +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 46962340B29 for ; Tue, 9 Mar 2021 18:22:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BCF9586 for ; Tue, 9 Mar 2021 18:22:07 +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: <1615314095.8547f12dc95fb46445d540486669aed209507392.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lua/lpeg/lpeg-1.0.2-r101.ebuild X-VCS-Directories: dev-lua/lpeg/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 8547f12dc95fb46445d540486669aed209507392 X-VCS-Branch: master Date: Tue, 9 Mar 2021 18:22:07 +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: db07ffc1-705e-4204-91c2-d090b60c532a X-Archives-Hash: 1002e06776bbd0891790ee1a3bea5629 commit: 8547f12dc95fb46445d540486669aed209507392 Author: Aaron Bauman gentoo org> AuthorDate: Tue Mar 9 18:21:35 2021 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Tue Mar 9 18:21:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8547f12d dev-lua/lpeg: fix build on Darwin; keyword for x64-macos Signed-off-by: Aaron Bauman gentoo.org> dev-lua/lpeg/lpeg-1.0.2-r101.ebuild | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild index 769fbe86123..fd6789b18f6 100644 --- a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild +++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${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 debug doc" REQUIRED_USE="${LUA_REQUIRED_USE}" @@ -39,6 +39,11 @@ lua_src_prepare() { src_prepare() { default use debug && append-cflags -DLPEG_DEBUG + + if [[ ${CHOST} == *-darwin* ]] ; then + append-ldflags "-undefined dynamic_lookup" + fi + lua_foreach_impl lua_src_prepare } @@ -70,6 +75,14 @@ lua_src_install() { instdir="$(lua_get_lmod_dir)" insinto "${instdir#${EPREFIX}}" doins re.lua + + 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}/lpeg.so" + install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/${file}" "${ED}/usr/$(get_libdir)/${file}" || die "Failed to adjust install_name" + fi } src_install() {