From nobody Sat Aug 27 10:33: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 4MFCjS6QkCz4b5g4; Sat, 27 Aug 2022 10:33:48 +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 4MFCjS5sNSz4DhF; Sat, 27 Aug 2022 10:33:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661596428; 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=Ww95kSV1myiII8t6up3PGGbIG2/k5Sjk3Eiqp45ByNc=; b=yYZBt27bEgyqvPqQ4pI7eJCmTuSfxagxBVN8n0cQPZD79k7D/6blqrvc3UYuMAcnM27h5F vapuWdSVrIBy5LrwUXFdwDYky1KP6UgpSF8n7d5Okm+94Wtllgc2WP1iz4Gt/WvNm1rcHW VDdwO/tuCJZhVpNepGpAQuhey2xaYSZN8xPgTPR2ysVReqnPTWHVa7AFLnpMN2L5qLWN4D YF8Tq+YTayj1dC8nCFp688EaVgB+o6GTSh1Tm0Bf4TnE58tveoFVnH/iP+MnkLh9AaxcSN T0l6fra7fSESPrKB+Eqar+AeMjBvrNNl3eXfvB9PhJTR34XUMwEEz2Srv2Vpxw== 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 4MFCjS4xFtzk5K; Sat, 27 Aug 2022 10:33: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 27RAXmaq053831; Sat, 27 Aug 2022 10:33:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27RAXm5d053830; Sat, 27 Aug 2022 10:33:48 GMT (envelope-from git) Date: Sat, 27 Aug 2022 10:33:48 GMT Message-Id: <202208271033.27RAXm5d053830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: fe8ed9605454 - main - lang/python310: Fix disabling uuid.h detection and stage-qa error 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe8ed9605454c28f8f7f576741220b7092f2dcdb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661596428; 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=Ww95kSV1myiII8t6up3PGGbIG2/k5Sjk3Eiqp45ByNc=; b=a1jhsdOL0YzsFX+JCA0R3qqFwS2PdiXehPwLF73+T+EFzETUlw88zfdblRB+n9atMCA9pT iSU5G0RBWnxp0jUid3u33zcClMwm6A4QhL1BRjF0xFOte3Q82+1Fivi9VJDwmpWm0Mu6oO x2c9i/gFbtM3OedFkOT2PD/aw8ycQ/KNOgMPLm/bhi/Sdl/GkLc+tAQKzAWtTW8elEvdEy 1yrr5hQoqbTbOA2JfheBqG/L79CTAqWfQ815NOF70d6bM6jGaCgx8sZ9JltZvkOFksBF33 Aa4JM93JObH4/y8R0eXsbsFoXI7IMFPXYWV5sZ07GSOjJULqoJEqDXJaG1AFyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661596428; a=rsa-sha256; cv=none; b=EMu7NpkV9Wz8YKkEC4eWfgqiqGjsVqn+91v5ZHSWaaueFLGP/459iDYueXcjbQJlV+fORV bPQK6wZS8NoZmVfFa94+WJ0g6+/Gms3i1i6MU1QKjy375B6Ve/7g0oW/4e2GOhRTmvFBOO WK0nvuDgajPq07MHBtxB3RweTkXOp0aSwdaqI5wOM8jCp8zqktK8pJTAU1AshrbhjeiPJX ODpVSi/rg1d6iKPgqzuXjh4ZR00Ylt9LHpPgZkdRsMuVIkpUsMw7nhSafLqgeFRVzdjH3B xh82m72a8o4e9/CCvIOGMb6qZSxxFhlJ6+haBI6xb6jfA0UrbMoH4nowNv5YTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe8ed9605454c28f8f7f576741220b7092f2dcdb commit fe8ed9605454c28f8f7f576741220b7092f2dcdb Author: Po-Chuan Hsieh AuthorDate: 2022-08-27 10:26:11 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-08-27 10:26:11 +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 () + {