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 D13DC1382C5 for ; Sat, 13 Mar 2021 12:21:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36795E089C; Sat, 13 Mar 2021 12:21:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 21AE7E089C for ; Sat, 13 Mar 2021 12:21:51 +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 16AA5335D60 for ; Sat, 13 Mar 2021 12:21:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 915BD13B for ; Sat, 13 Mar 2021 12:21:48 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1615638104.d02c4bd0c03b2824f55cfff124de93ebccde8c2e.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/snappy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/snappy/snappy-1.1.0.1.ebuild X-VCS-Directories: dev-java/snappy/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d02c4bd0c03b2824f55cfff124de93ebccde8c2e X-VCS-Branch: master Date: Sat, 13 Mar 2021 12:21:48 +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: 9bfade4a-4a1b-4ba6-bae7-f49f0dbd20b4 X-Archives-Hash: a755ccfb63c6abf740e6cfcc70202d02 commit: d02c4bd0c03b2824f55cfff124de93ebccde8c2e Author: Fabian Groffen gentoo org> AuthorDate: Sat Mar 13 12:21:40 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Mar 13 12:21:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d02c4bd0 dev-java/snappy-1.1.0.1: fix for and marked ~x64-macos Closes: https://bugs.gentoo.org/638284 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> dev-java/snappy/snappy-1.1.0.1.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-java/snappy/snappy-1.1.0.1.ebuild b/dev-java/snappy/snappy-1.1.0.1.ebuild index 60983950c43..443002b9ab8 100644 --- a/dev-java/snappy/snappy-1.1.0.1.ebuild +++ b/dev-java/snappy/snappy-1.1.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -16,7 +16,7 @@ SRC_URI="https://github.com/xerial/${MY_PN}/archive/${PV}.tar.gz -> ${PN}-java-$ LICENSE="Apache-2.0" SLOT="1.1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~x64-macos" IUSE="" CDEPEND="dev-java/osgi-core-api:0 @@ -53,7 +53,14 @@ src_compile() { } src_install() { - java-pkg_doso "${S}"/target/libsnappyjava.so + local jniext=.so + if [[ ${CHOST} == *-darwin* ]] ; then + jniext=.jnilib + # avoid install_name check failure + install_name_tool -id @loader_path/libsnappyjava${jniext} \ + "${S}"/target/libsnappyjava${jniext} + fi + java-pkg_doso "${S}"/target/libsnappyjava${jniext} java-pkg_dojar "${S}/target/${PN}.jar" use source && java-pkg_dosrc "${S}"/src/main/java/*