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 7F67513835A for ; Wed, 14 Apr 2021 22:03:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E88EE0917; Wed, 14 Apr 2021 22:03:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 17D91E0917 for ; Wed, 14 Apr 2021 22:03:06 +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 E05CA340D2A for ; Wed, 14 Apr 2021 22:03:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F52C64D for ; Wed, 14 Apr 2021 22:03:03 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1618437617.67905451047fb5fb4b0743fd37bfd3ed6cbfec8d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mujs/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mujs/mujs-1.1.1.ebuild X-VCS-Directories: dev-lang/mujs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 67905451047fb5fb4b0743fd37bfd3ed6cbfec8d X-VCS-Branch: master Date: Wed, 14 Apr 2021 22:03:03 +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: 82816221-3ed3-4ee5-9e1a-63be02d8421a X-Archives-Hash: 5e2cf874ebd23855262bceef7c1ef20b commit: 67905451047fb5fb4b0743fd37bfd3ed6cbfec8d Author: Sam James gentoo org> AuthorDate: Wed Apr 14 21:36:38 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Apr 14 22:00:17 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67905451 dev-lang/mujs: fix install on Darwin Signed-off-by: Sam James gentoo.org> dev-lang/mujs/mujs-1.1.1.ebuild | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dev-lang/mujs/mujs-1.1.1.ebuild b/dev-lang/mujs/mujs-1.1.1.ebuild index f4a97b55578..7351763bc8e 100644 --- a/dev-lang/mujs/mujs-1.1.1.ebuild +++ b/dev-lang/mujs/mujs-1.1.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit flag-o-matic multilib toolchain-funcs DESCRIPTION="An embeddable JavaScript interpreter in C" HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs" @@ -27,9 +27,15 @@ src_prepare() { tc-export AR CC + append-cflags -fPIC + # library's ABI (and API) changes in ~each release: # diff 'usr/includemujs.h' across releases to validate - append-cflags -fPIC -Wl,-soname=lib${PN}.so.${PV} + if [[ ${CHOST} == *-darwin* ]] ; then + append-cflags -Wl,-install_name,"${EPREFIX}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib + else + append-cflags -Wl,-soname=lib${PN}.so.${PV} + fi } src_compile() { @@ -44,15 +50,21 @@ src_compile() { src_install() { local myemakeargs=( DESTDIR="${ED}" + VERSION=${PF} libdir="/usr/$(get_libdir)" - prefix="/usr" - VERSION="${PV}" + prefix=/usr ) emake "${myemakeargs[@]}" install-shared - mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die - - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so - dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} + # TODO: Tidy up this logic, improve readability + if [[ ${CHOST} == *-darwin* ]] ; then + mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}.${PV}.dylib || die + dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.dylib + dosym lib${PN}.${PV}.dylib /usr/$(get_libdir)/lib${PN}.${PV:0:1}.dylib + else + mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so{,.${PV}} || die + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1} + fi }