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 6F6F51382C5 for ; Mon, 30 Nov 2020 14:51:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E479E0972; Mon, 30 Nov 2020 14:51:04 +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 81571E0972 for ; Mon, 30 Nov 2020 14:51:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 17459341050 for ; Mon, 30 Nov 2020 14:51:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 563A63A6 for ; Mon, 30 Nov 2020 14:51:01 +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: <1606747848.0bdb2489027a808f33a4c4c95c3ae16ce9ef3d89.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/talloc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/talloc/talloc-2.3.1.ebuild X-VCS-Directories: sys-libs/talloc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0bdb2489027a808f33a4c4c95c3ae16ce9ef3d89 X-VCS-Branch: master Date: Mon, 30 Nov 2020 14:51:01 +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: 57991072-f542-4d71-87bd-f0b634f3f2fc X-Archives-Hash: e015e0b836f6b81b1ea8b954e8b3db25 commit: 0bdb2489027a808f33a4c4c95c3ae16ce9ef3d89 Author: Sam James gentoo org> AuthorDate: Mon Nov 30 14:50:41 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 30 14:50:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bdb2489 sys-libs/talloc: fix Darwin build Package-Manager: Portage-3.0.10.2-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sys-libs/talloc/talloc-2.3.1.ebuild | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/sys-libs/talloc/talloc-2.3.1.ebuild b/sys-libs/talloc/talloc-2.3.1.ebuild index ec25e7966a9..e6dbe274fd6 100644 --- a/sys-libs/talloc/talloc-2.3.1.ebuild +++ b/sys-libs/talloc/talloc-2.3.1.ebuild @@ -53,6 +53,13 @@ pkg_setup() { src_prepare() { default + if [[ ${CHOST} == *-darwin* ]] ; then + # Drop irritating ABI names (e.g. cpython-37m) + # We're only installing one implementation anyway + sed -i "s/+ conf.all_envs\['default'\]\['PYTHON_SO_ABI_FLAG'\]//" wscript || die + sed -i "s/name = bld.pyembed_libname('pytalloc-util')/name = 'pytalloc-util'/" wscript || die + fi + # what would you expect of waf? i won't even waste time trying. multilib_copy_sources } @@ -78,19 +85,33 @@ multilib_src_install() { if [[ ${CHOST} == *-darwin* ]] ; then install_name_tool \ -id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die + "${ED}"/usr/$(get_libdir)/libtalloc.${PV}.dylib || die + if use python ; then install_name_tool \ -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die + "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die + install_name_tool \ + -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ + "${ED}"/usr/$(get_libdir)/libpytalloc-util.${PV}.dylib || die + + install_name_tool \ + -id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ + "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die + install_name_tool \ + -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ + "${ED}"/usr/$(get_libdir)/libpytalloc-util.dylib || die + install_name_tool \ - -change "${S}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die + -change "${BUILD_DIR}/bin/default/libpytalloc-util.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.dylib \ + "${D}"$(python_get_sitedir)/talloc*.bundle || die install_name_tool \ - -change "${S}/bin/default/libtalloc.dylib" \ - "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ - "${D}"$(python_get_sitedir)/talloc.bundle || die + -change "${BUILD_DIR}/bin/default/libtalloc.dylib" \ + "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \ + "${D}"$(python_get_sitedir)/talloc*.bundle || die fi fi }