From nobody Wed Oct 27 23:58:09 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0539318376C4; Wed, 27 Oct 2021 23:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hflxt2Gwhz3tKg; Wed, 27 Oct 2021 23:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0AF4119650; Wed, 27 Oct 2021 23:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19RNw9U2062664; Wed, 27 Oct 2021 23:58:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19RNw9wX062663; Wed, 27 Oct 2021 23:58:09 GMT (envelope-from git) Date: Wed, 27 Oct 2021 23:58:09 GMT Message-Id: <202110272358.19RNw9wX062663@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 054a651015be - main - www/py-adblock: fix build on powerpc64* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 054a651015bea4570f69c07fedd678ba077f30db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=054a651015bea4570f69c07fedd678ba077f30db commit 054a651015bea4570f69c07fedd678ba077f30db Author: Piotr Kubaj AuthorDate: 2021-10-27 23:52:41 +0000 Commit: Piotr Kubaj CommitDate: 2021-10-27 23:52:41 +0000 www/py-adblock: fix build on powerpc64* Python uses architecture name from "uname -m", but on FreeBSD it should actually use "uname -p". This causes pip to misrecognize valid wheel as wrong: ERROR: adblock-0.5.0-cp36-abi3-freebsd_13_0_RELEASE_p4_powerpc64.whl is not a supported wheel on this platform. This patch renames files on powerpc64* to end with powerpc.whl, which is acceptable for pip. --- www/py-adblock/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/www/py-adblock/Makefile b/www/py-adblock/Makefile index f535cabd658f..f9465416f6aa 100644 --- a/www/py-adblock/Makefile +++ b/www/py-adblock/Makefile @@ -99,6 +99,8 @@ CARGO_BUILD= no CARGO_INSTALL= no CARGO_TARGET_DIR= ${WRKSRC}/target +.include + # This is to prevent Mk/Uses/python.mk do-configure target from firing. do-configure: @@ -110,6 +112,10 @@ do-build: # Due to upstream not supplying a setup.py file or other way to install # using pip command for now... do-install: +.if ${ARCH:Mpowerpc64*} + @(cd ${INSTALL_WRKSRC}; \ + ${FIND} . -name "*whl" -exec sh -c 'mv {} `echo {} | sed -E -e "s/powerpc.*/powerpc.whl/"`' \;) +.endif @(cd ${INSTALL_WRKSRC} ; \ ${INSTALL_DATA} "target/release/libadblock.so" \ "${STAGEDIR}/${PREFIX}/lib" ; \