From nobody Sat Mar 26 09:25:48 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 1DD241A2A23D; Sat, 26 Mar 2022 09:25:49 +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 4KQYV4676hz4RjW; Sat, 26 Mar 2022 09:25:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648286748; 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=y4Ygu3t2VY2FAQWDAYJ724w/pjAxD2I3hpBXAnwAsl4=; b=CP5nUR1JOZxsheFqjEhQmI9xkVVEnNUAGQlklnTwrGWqSbnnoVYHqezeKBmbpt5mklrfi/ fzn34NRoHwokIssCKQfErn3iPoasM9U2+q5A66ynQrQwuNrK52TJ/Cw4HJZkd+9Ku29E1I E6txdmeug0TfBIKCk5Asj9MaIdKnYuooXcr/6Qn1NZwFTUI2Tnho8Ys5iCw3GbVsZCNbGZ J+WeUC8v2CnS9qQ2/kNcPecAkDKBobw35zkQeYfqMGFZ9+lXHW7TEAySrEIIkNNI/Z78TY /c2zGHbXci8N0xRBLyf6op6/4zxd1vgABjBxfIxuRAHecFBvf5AzyJs2ydbDyg== 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 AF5261E5C1; Sat, 26 Mar 2022 09:25:48 +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 22Q9PmaM024957; Sat, 26 Mar 2022 09:25:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22Q9PmR3024956; Sat, 26 Mar 2022 09:25:48 GMT (envelope-from git) Date: Sat, 26 Mar 2022 09:25:48 GMT Message-Id: <202203260925.22Q9PmR3024956@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: ec88d485c32b - main - devel/libsigrokdecode: support Python-3.9 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec88d485c32bfc7e9c10fc00873e437ba5eb57fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648286748; 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=y4Ygu3t2VY2FAQWDAYJ724w/pjAxD2I3hpBXAnwAsl4=; b=q803fcasbOworc8El/iCOj3Ln3wnBo49y5GpAqPwmWJjWRNiUIa91kFza7DKlTknc+BOVs Oe4fYgpliuGChTG+R1Nu2PocMFiYwMLhh58tI0kuD5hPO6dX7ymsqz0EVuU2FSJ0AHfEGv vNHRJECpcOCOre0upUELcs4rprQXFz4F5/Ss4ohr9TV0OqqiGuPiKJs3Arb60xbRSKtaoz nSaq43BG8V/gQyGqovUip5FwAXuwqIC22ruQgdeyexWE1a6nPU6Llrf1KPUpCiz6f5oCfu +Np9ubMxUR+l3nb/FM5sbOML5jZG4T9pMDHcmTD0ulIrR9fvu7GKudu9Vz8e9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648286748; a=rsa-sha256; cv=none; b=GwZ/71nrBV8x1REllnuZuffzcKxVYdt3YYHIOKA7W1yqlwTLGZo255kbqogu3tso+MQDLk XuLqD32PBZ1Lt9rcZBdHqws/Pfrp+Nmts3fyA6Swy1idNA6oRpfCXcTuezwUHUAnK41bXo HQzwpEwyOlpVN66+fjreAexUFA0dRKg/Iml43nE4rd7gGdoPNiKJozaj6ntxOpjpp8SWOl RhtrEYGVcO/FX3upTAxsmuwyAImGBNI1X/4WUHw7jDR/oX4AcgPnn+4Nbp1zFJekwkQ4XH UQQDNil08WOm119Z+xx3jDWLUUX97wLWZzqA2uoxUgNxCV566438N0nNnOwWVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec88d485c32bfc7e9c10fc00873e437ba5eb57fc commit ec88d485c32bfc7e9c10fc00873e437ba5eb57fc Author: Thierry Thomas AuthorDate: 2022-03-02 21:21:58 +0000 Commit: Thierry Thomas CommitDate: 2022-03-26 09:24:38 +0000 devel/libsigrokdecode: support Python-3.9 PR: 262305 Approved by: maintainer’s time-out --- devel/libsigrokdecode/Makefile | 4 ++- devel/libsigrokdecode/files/patch-configure | 44 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/devel/libsigrokdecode/Makefile b/devel/libsigrokdecode/Makefile index dc1b8159163e..9319575e4b5f 100644 --- a/devel/libsigrokdecode/Makefile +++ b/devel/libsigrokdecode/Makefile @@ -11,9 +11,11 @@ COMMENT= Framework for hardware logic analyzers, protocol decoders library LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes USES= gnome libtool pathfix pkgconfig python:3.4+ USE_GNOME= glib20 + +GNU_CONFIGURE= yes +CONFIGURE_ENV= PYTHON3=${PYTHON_CMD} MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/devel/libsigrokdecode/files/patch-configure b/devel/libsigrokdecode/files/patch-configure new file mode 100644 index 000000000000..8793549374da --- /dev/null +++ b/devel/libsigrokdecode/files/patch-configure @@ -0,0 +1,44 @@ +--- configure.orig 2019-12-11 21:37:52 UTC ++++ configure +@@ -13200,6 +13200,30 @@ sr_pkg_check_summary_append() { + # first, since usually only that variant will add "-lpython3.8". + # https://docs.python.org/3/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build + if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.9-embed\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "python-3.9-embed") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ sr_have_python3=yes ++ SRD_PKGLIBS=${SRD_PKGLIBS}${SRD_PKGLIBS:+' '}"python-3.9-embed" ++ sr_python3_version=`$PKG_CONFIG --modversion "python-3.9-embed" 2>&5` ++ sr_pkg_check_summary_append "python-3.9-embed" "$sr_python3_version" ++else ++ sr_pkg_check_summary_append "python-3.9-embed" no ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.9 >= 3.9\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "python-3.9 >= 3.9") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ sr_have_python3=yes ++ SRD_PKGLIBS=${SRD_PKGLIBS}${SRD_PKGLIBS:+' '}"python-3.9 >= 3.9" ++ sr_python3_version=`$PKG_CONFIG --modversion "python-3.9 >= 3.9" 2>&5` ++ sr_pkg_check_summary_append "python-3.9 >= 3.9" "$sr_python3_version" ++else ++ sr_pkg_check_summary_append "python-3.9 >= 3.8" no ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-3.8-embed\""; } >&5 + ($PKG_CONFIG --exists --print-errors "python-3.8-embed") 2>&5 + ac_status=$? +@@ -13308,6 +13332,10 @@ else + else + sr_pkg_check_summary_append "python3 >= 3.2" no + sr_have_python3=no sr_python3_version= ++fi ++ ++fi ++ + fi + + fi