From nobody Sat Sep 10 10:52:35 2022 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 4MPqSh1HvCz4bkZQ; Sat, 10 Sep 2022 10:52:36 +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 4MPqSh0HS3z3b6k; Sat, 10 Sep 2022 10:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662807156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltj71U8UgDSERNYaynaexBA4ZMA2KLv1S01u102Cdoo=; b=XH8KEDvZ+1K3tBuhQiWUn0A7DblaAEjhrwF8AhhvZ1Uu/k+0PKoDp05hynzN/ehiKfUzuf Tk2eWAUkRyFDT/HrNAtrGvEmwILW66nTIHqc0Fo7SZlLuEjHY1ewySwrkG4M3Lz1CWqqKn 24jNC5iSMBFPSLU2VIa0+1PJrZXhqAKetIArlkPfxOtQK9+qD0MK5UfOjtOln/6hfXiHOw qay7jqrFYIN7/6YiqMtY0JD+sFvPdk5pwB73c2vYZakZYiuOMfxttEIw+PWD6+2MjJjZqm oa/FsbcKrMMofg4R/30OvFaimcEx3p5bZ34vTRFzeROxvvLvWaFO83o7rnJMMA== 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 4MPqSg6S2FzHD4; Sat, 10 Sep 2022 10:52:35 +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 28AAqZWB063093; Sat, 10 Sep 2022 10:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28AAqZj9063092; Sat, 10 Sep 2022 10:52:35 GMT (envelope-from git) Date: Sat, 10 Sep 2022 10:52:35 GMT Message-Id: <202209101052.28AAqZj9063092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 8978bbb9747c - main - www/py-adblock: Prepare for py-maturin >= 0.13.0 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8978bbb9747c44ba8ddf8058ea3419c363e92bf2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662807156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ltj71U8UgDSERNYaynaexBA4ZMA2KLv1S01u102Cdoo=; b=vbSfQ5UgB1QThqTb/7KXAvRhyUvO0pB3MnidouYH2/sT4BoKzv9eAdQDm056y/qc8tMWrV VwkwlY4XyEYsVvdMW0IT2Um9YbiPZTI7kE1m+nMEIqy0icaFuUiT2xTV/Cpd//5cbSowxN cuH9cRaP6EOS8GqJG9i0X+TpxE1p+djZkNbkV4nLEGL/+pWZsoBU2gbpVDxtjgeIb9KR2z xjzXBlIA3EBv1dO8fLWpLCLQCIff3RX9nHPK9GlQA9EPXuLhAM/+3OWW2mFeQ/lNuahz00 GW3cM3l3KC9psHdbliv38CLxb2HBbECiZTRHIYfXA1B4YI2g0szG1QTsV4hTKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662807156; a=rsa-sha256; cv=none; b=fRaG1iB0qoYoQl+92gQzMv1DXgCx4lHEBsb3znKU9IhWcaueDIAzoVfCmdaRiNFoWIfUZu XlbxO8FsUZASRz13Pvri/tGRdAEiUAvYAq6gO0gaAPHJGy5agT6+MCMAlkKwXd/ApYbJVj aDMN98Okcaer/KCgwz7pj8XjbHOlisB2qPRy7MtB/pNN6MveeDL905eo2a4oclDSTNHhi0 J5Z33G8soI4SVEx6+Q2EYhTI8c5zJReNizaEZrpe1TRs1ceZxbNL0Mcg3ukfosdNKgnGbY zruRGGf2BjYo9zCXv34iXme21fF5djLj1dle8hpSsHp8GhyVvfrL9H8N7GkgDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=8978bbb9747c44ba8ddf8058ea3419c363e92bf2 commit 8978bbb9747c44ba8ddf8058ea3419c363e92bf2 Author: Kai Knoblich AuthorDate: 2022-09-10 10:33:40 +0000 Commit: Kai Knoblich CommitDate: 2022-09-10 10:33:40 +0000 www/py-adblock: Prepare for py-maturin >= 0.13.0 * Since the 0.13.0 release maturin no longer searches for the Python interpreters by default and uses the current interpreter found in the PATH environment variable. Thus set BINARY_ALIAS to give a specific Python interpreter during build. * Fix build as well if building the port for multiple Python flavors by using FLAVOR_DEFAULT_ALL in poudriere and BUILD_ALL_PYTHON_FLAVORS in the make.conf. * Add CONFLICTS_INSTALL because a shared library is installed outside of Python's site-lib directory. * No bump of PORTREVISION as the package content isn't changed. PR: 266211 (related) Approved by: portmgr (blanket) --- www/py-adblock/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/www/py-adblock/Makefile b/www/py-adblock/Makefile index 41feb5e1a0ab..3004f7141aee 100644 --- a/www/py-adblock/Makefile +++ b/www/py-adblock/Makefile @@ -100,6 +100,11 @@ CARGO_BUILD= no CARGO_INSTALL= no CARGO_TARGET_DIR= ${WRKSRC}/target +CONFLICTS_INSTALL= py3[0-9]-adblock py3[0-9][0-9]-adblock # lib/libadblock.so + +# Required since maturin >= 0.13.0 +BINARY_ALIAS= python3=${PYTHON_CMD} + .include # This is to prevent Mk/Uses/python.mk do-configure target from firing. @@ -108,7 +113,7 @@ do-configure: do-build: @(cd ${BUILD_WRKSRC} ; \ PSL_PATH="${PREFIX}/share/public_suffix_list/public_suffix_list.dat" \ - ${SETENV} ${MAKE_ENV} maturin build --release ${WITH_DEBUG:D:U--strip}) + ${SETENV} ${MAKE_ENV} maturin-${PYTHON_VER} build --release ${WITH_DEBUG:D:U--strip}) # Due to upstream not supplying a setup.py file or other way to install # using pip command for now... @@ -120,7 +125,7 @@ do-install: @(cd ${INSTALL_WRKSRC} ; \ ${INSTALL_DATA} "target/release/libadblock.so" \ "${STAGEDIR}/${PREFIX}/lib" ; \ - ${SETENV} ${MAKE_ENV} pip install --isolated --root=${STAGEDIR} \ + ${SETENV} ${MAKE_ENV} pip-${PYTHON_VER} install --isolated --root=${STAGEDIR} \ --ignore-installed --no-deps target/wheels/*.whl) post-install: