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 96788138334 for ; Thu, 6 Dec 2018 10:16:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72743E091C; Thu, 6 Dec 2018 10:16:43 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 42646E091C for ; Thu, 6 Dec 2018 10:16:43 +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 2CB95335CCB for ; Thu, 6 Dec 2018 10:16:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A0744CB for ; Thu, 6 Dec 2018 10:16:39 +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: <1544091394.8a58d437cd9ae4f427b5f0bfc7a65e16d5ba23b9.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/go/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/go/go-1.11.2.ebuild dev-lang/go/go-9999.ebuild X-VCS-Directories: dev-lang/go/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 8a58d437cd9ae4f427b5f0bfc7a65e16d5ba23b9 X-VCS-Branch: master Date: Thu, 6 Dec 2018 10:16:39 +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: 2c6aa0ae-0c7c-49bd-9391-b5f2ec75431f X-Archives-Hash: 55e3d70b1178fd16c7fa01165d0739d7 commit: 8a58d437cd9ae4f427b5f0bfc7a65e16d5ba23b9 Author: Fabian Groffen gentoo org> AuthorDate: Thu Dec 6 10:16:18 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Dec 6 10:16:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a58d437 dev-lang/go: fix installation on Darwin Signed-off-by: Fabian Groffen gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-lang/go/go-1.11.2.ebuild | 8 ++++++++ dev-lang/go/go-9999.ebuild | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dev-lang/go/go-1.11.2.ebuild b/dev-lang/go/go-1.11.2.ebuild index 3eecca0eb62..58aa8cbd90d 100644 --- a/dev-lang/go/go-1.11.2.ebuild +++ b/dev-lang/go/go-1.11.2.ebuild @@ -225,4 +225,12 @@ src_install() dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} done einstalldocs + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi } diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 503bf3c4a12..dd4aa9a0894 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -225,4 +225,12 @@ src_install() dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} done einstalldocs + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name for test object (binutils_test) on Darwin, it + # is never used in real circumstances + local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/ + libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64 + install_name_tool -id "${libmac64}" "${D}${libmac64}" + fi }