From nobody Fri Sep 09 08:02:29 2022 X-Original-To: dev-commits-ports-branches@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 4MP7ks3mGmz4c3p1; Fri, 9 Sep 2022 08:02:29 +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 4MP7ks3Lywz3KFP; Fri, 9 Sep 2022 08:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662710549; 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=bJiNKfiymNQK5qppk9pwb3k74U+7+/CJ0knaoduW+E4=; b=gqJIgtGMUqNWtdjuKLBtLr++Rzm6jo7TVHUVFOxFOpA1GaAEzc4vRyIurYPQz7kpIWdYw/ /23SAVQa5V/YAPbqQX9pGZleMJ5eL/Hzd5FwHjI7QeUv+kFvkNASzkGcx95gZpfg/NUKu0 VC1Ni1x5S9ncJO6z3Fh9JZzJYZbZFOTRObihtkCdn3NwmpZLNppUUz2bAnnh2wCK1ri8HL kyL94dm8n1Hc8xED7cwQj1PBgZjGeq5nZxRla5HKbITuOHANDscTuQdcvFJ4+Wzmx5lLWE 2mMZT8KNiJmdF/jC8WByZY8cL4F45ibEMHT1Tx7TArvfj0gybqvLGCyEPT3NnQ== 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 4MP7ks2QNRz18KT; Fri, 9 Sep 2022 08:02:29 +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 28982TkN054536; Fri, 9 Sep 2022 08:02:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28982TmT054535; Fri, 9 Sep 2022 08:02:29 GMT (envelope-from git) Date: Fri, 9 Sep 2022 08:02:29 GMT Message-Id: <202209090802.28982TmT054535@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Wen Heping Subject: git: 94633f9d526b - 2022Q3 - lang/python310: Fix disabling uuid.h detection and stage-qa error List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 94633f9d526b5d49071ff2c73f762c1c417be8b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662710549; 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=bJiNKfiymNQK5qppk9pwb3k74U+7+/CJ0knaoduW+E4=; b=WOopErN3TtQvj4HPHbawhqrLD5UljLorsn4NoWHxw87EQMhO2VUb1v1XYQ+ZJdBOoY+xwf sgcB0LrtzeUQrKX/lXC0MjTOqzIG0nb3c0bFBYl78iSiHHzFm6npvlFnNjKbIRic6OBXg/ lfXweIvJ6tiYHnwFnRRtBcpKYiAsknOd1fXhpRz4WRChI0MIMgEAJw3Ex9XVTZ/zhs3kBT FvckbeN35NVWFLb4mHY7cDSvry8NvCijhTi0jZeWvPSxL/+h/jdQlSNAfDkQ7d3IPlgpr5 HhtpHkIjt+RvRRZqjdu2OcZQghmK3ymATuIdEAnHdQpc6olIwlF9GJebSHpMRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662710549; a=rsa-sha256; cv=none; b=NsEGS6BnXaxi7MwXmqj861zi/8IFSslRfHIYm8LON/tIsIGvURh7GNa77EmhlP/RFnhg1x zg1Df4AY+PnM4fkQCmhXinV9Of031uK0MlHGw9WG5+XHRcsz7YJWGxMotNIRZ0iFg/MYwU UI4ceH9p/5AROm25kwy0dxZU6D95ohkHFOXEw7rAcP55kAbNwWAC43npCTRfpaMLTgckZq RWK21bffcfZM94gUgVvaNPpB/GUQNlanom8ykHhzgjzSVJ90tU1BEXVIvsyHO+xViA41f1 mMrz4qMLX6mFov/PZimRSZAH1vPLTfKkkxr8HLcaPKNN9N1l9INtNmXROpxTLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=94633f9d526b5d49071ff2c73f762c1c417be8b6 commit 94633f9d526b5d49071ff2c73f762c1c417be8b6 Author: Po-Chuan Hsieh AuthorDate: 2022-08-27 10:26:11 +0000 Commit: Wen Heping CommitDate: 2022-09-09 07:58:34 +0000 lang/python310: Fix disabling uuid.h detection and stage-qa error - Bump PORTREVISION for package change ====> Running Q/A tests (stage-qa) Error: /usr/local/lib/python3.10/lib-dynload/_uuid.cpython-310.so is linked to /usr/local/lib/libuuid.so.1 from misc/e2fsprogs-libuuid but it is not declared as a dependency Warning: you need LIB_DEPENDS+=libuuid.so:misc/e2fsprogs-libuuid ... Warning: Possible REINPLACE_CMD issues: - - REINPLACE_CMD ran, but did not modify file contents: setup.py --- lang/python310/Makefile | 5 +---- lang/python310/files/patch-configure | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/lang/python310/Makefile b/lang/python310/Makefile index f2ec1104c73f..37d9ec6fffc6 100644 --- a/lang/python310/Makefile +++ b/lang/python310/Makefile @@ -1,5 +1,6 @@ PORTNAME= python DISTVERSION= ${PYTHON_DISTVERSION} +PORTREVISION= 1 CATEGORIES= lang python MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//} PKGNAMESUFFIX= ${PYTHON_SUFFIX} @@ -122,10 +123,6 @@ PLIST_SUB+= SUPPORTED_OPENSSL="" .endif post-patch: -# disable the detection of includes and library from e2fsprogs-libuuid, -# which introduces hidden dependency and breaks build - @${REINPLACE_CMD} -e 's|uuid/uuid.h|ignore_&|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py # disable detection of multiarch as it breaks with clang >= 13, which adds a # major.minor version number in -print-multiarch output, confusing Python @${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure diff --git a/lang/python310/files/patch-configure b/lang/python310/files/patch-configure index c78047439605..1890947cf0d6 100644 --- a/lang/python310/files/patch-configure +++ b/lang/python310/files/patch-configure @@ -1,4 +1,7 @@ ---- configure.orig 2022-02-23 19:52:00 UTC +Disable the detection of includes and library from e2fsprogs-libuuid, which +introduces hidden dependency and breaks build + +--- configure.orig 2022-08-01 20:25:27 UTC +++ configure @@ -6625,7 +6625,7 @@ fi @@ -9,3 +12,21 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args. +@@ -10123,7 +10123,7 @@ fi + # Dynamic linking for HP-UX + + # checks for uuid.h location +-for ac_header in uuid/uuid.h uuid.h ++for ac_header in uuid.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +@@ -10141,7 +10141,7 @@ done + $as_echo_n "checking for uuid_generate_time_safe... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include ++#include + int + main () + {