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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C8638158086 for ; Sat, 25 Dec 2021 19:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14BCC2BC028; Sat, 25 Dec 2021 19:48:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB2912BC028 for ; Sat, 25 Dec 2021 19:48:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 018A034301B for ; Sat, 25 Dec 2021 19:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 982CF218 for ; Sat, 25 Dec 2021 19:48:47 +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: <1640461710.7483feb9e18b1e6b0bd3f26c17534005196ce407.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.2.0.ebuild X-VCS-Directories: dev-lang/mujs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7483feb9e18b1e6b0bd3f26c17534005196ce407 X-VCS-Branch: master Date: Sat, 25 Dec 2021 19:48:47 +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: d4fed04f-7fc9-4cb7-8a0a-a9503d3f186a X-Archives-Hash: ea1416a601a2b7e00aeb91a46e5e98a7 commit: 7483feb9e18b1e6b0bd3f26c17534005196ce407 Author: Sam James gentoo org> AuthorDate: Sat Dec 25 19:48:30 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 25 19:48:30 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7483feb9 Revert "dev-lang/mujs: cleaned up src_install" Didn't mean to push! This reverts commit 4112182b3c927242e10b8b7aca46b5883b14c896. Signed-off-by: Sam James gentoo.org> dev-lang/mujs/mujs-1.2.0.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-lang/mujs/mujs-1.2.0.ebuild b/dev-lang/mujs/mujs-1.2.0.ebuild index 9c1e0ae5c390..e25bff9dec49 100644 --- a/dev-lang/mujs/mujs-1.2.0.ebuild +++ b/dev-lang/mujs/mujs-1.2.0.ebuild @@ -55,7 +55,14 @@ src_install() { prefix=/usr \ install-shared - mv -v "${ED}"/usr/$(get_libdir)/lib${PN}.so "${ED}"/usr/$(get_libdir)/lib${PN}$(get_libname ${PV}) || die "Failed adding version suffix to mujs shared library" - dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}$(get_libname) - dosym lib${PN}$(get_libname ${PV}) /usr/$(get_libdir)/lib${PN}.$(get_libname ${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 }