From nobody Mon Jan 30 23:39:39 2023 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 4P5PmC3xGGz3bT90; Mon, 30 Jan 2023 23:39:39 +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 4P5PmC3Cpmz4PJB; Mon, 30 Jan 2023 23:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675121979; 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=iJ0dEcl9DiRfricHvtYQaNLQnSl6On/UNBHY/kZyzfU=; b=IPePUSmDKhNRSU/ynuM4oYiOEJ0GP8zSMpIIotPzadYIIRNxO11/SgBAAonf0/0REEp2d8 8ouA8u7FzjdJcy8NrnL5r2h82VLKn6FJ2OCxGUE77378TwKSSf0PY7nGZXcp4qJ8gldiw6 7g5v9LxGV+LYruoMiwRNevy0ikphSghCLNsM7+VyvVfy1HBQeJTCRlh/pmfkcRxwcsbxZd Na2iorBZczIgalDwVOdh9l/QFQTumtT7LrAZlH/yRCsVtNlI7qq8wU2BYnxQdm/t0ngkB4 x9imdqR+BtJl8WiXJW+PF+or90qqjt+ozfZQbSPzyu+fUBwq7mKyuMxVjCD+Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675121979; 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=iJ0dEcl9DiRfricHvtYQaNLQnSl6On/UNBHY/kZyzfU=; b=p8GxBs/jdUrGqsJVNQDBuqLtMgu2PRAzBJ9PInqN290McU2F4FiyQdSN7l15rjOdxbYe6Z 6RQcaNC1ydyfuGBdAlc71SglNHLpT9dcjOzjmO1dn5dNSJyAQZBUmUqwN0PV+QV2l1CO06 BoqW4r1lfKsDNF33H78xYpNc8FUu+0YOxhs/QHGRwQ1g43lGsTdcYbVk5JT7LyWQJm5Iuy vt4U7f+rKZmWsa5bjZGQtITLcLsOCwAXskZNUzcsQ4SYN0OnSPVH2I9CpPEQ1iq55u5yh2 NHSaA9fkRCDr/rfDLYG0m8EaXNY06uM9+X9qcIE20CRwz/LQMRIxQY5XK1ZWaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675121979; a=rsa-sha256; cv=none; b=vDc6ufEIECCVp991kI0WVSYLuRQvmedY9kC173avmCi7+bkuHDzHpfopl3d9M+F/XDxWYU kbQYz2s4TOwqtrpCbQ0zqV2c+/jhBDpELiK/YWHablpjCf+iEoahX4FZwZxep1cT/v52X7 qf9qBKOqDFHI+W63lem2uNZtYL2CTU43jbebgEAyiNkcL5Bj/jfTOogylNX87S+Ex/prbL 00AuoILLv/vwR6SlwR4SipYlsXy2B9TvTKGgnut4g4YhXYyVuLH/zkCrcmJnCTGTPcdkky gP2tZIPZQVs7zFuzQoN4J4P/5lZ2ZGXq1t5r689h/Pc5Q77uUc3hbKexiTSLZA== 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 4P5PmC1DYnzS2S; Mon, 30 Jan 2023 23:39:39 +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 30UNddKY073756; Mon, 30 Jan 2023 23:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UNdd4p073755; Mon, 30 Jan 2023 23:39:39 GMT (envelope-from git) Date: Mon, 30 Jan 2023 23:39:39 GMT Message-Id: <202301302339.30UNdd4p073755@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: c16e3dc045cf - main - devel/llvm14: fix packaging with debug python 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c16e3dc045cfe2485d4021ad205d58be276dba02 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=c16e3dc045cfe2485d4021ad205d58be276dba02 commit c16e3dc045cfe2485d4021ad205d58be276dba02 Author: Brooks Davis AuthorDate: 2023-01-30 23:38:37 +0000 Commit: Brooks Davis CommitDate: 2023-01-30 23:39:26 +0000 devel/llvm14: fix packaging with debug python The actual suffix if python extensions (at least as built by the LLVM infrastructure) is ${PYTHON_EXT_SUFFIX}${PYTHON_ABIVER} not merely the former. PR: 268437 Sponsored by: DARPA --- devel/llvm14/Makefile | 3 ++- devel/llvm14/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index f65880ef6c4e..78473f4f3e70 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -168,6 +168,7 @@ LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ -DPANEL_LIBRARIES=/usr/lib/libpanel.so LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG +LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit LLDB_VARS= _USES_PYTHON=python:3.6+ MLIR_DESC= Multi-Level Intermediate Representation @@ -624,7 +625,7 @@ build-plist: ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \ - -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}|%%PYTHON_EXT_SUFFIX%%|' \ + -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}${PYTHON_ABIVER}|%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%|' \ -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ diff --git a/devel/llvm14/pkg-plist b/devel/llvm14/pkg-plist index 21dcc4b7ddc9..6fb76997810d 100644 --- a/devel/llvm14/pkg-plist +++ b/devel/llvm14/pkg-plist @@ -133,7 +133,7 @@ bin/split-file%%LLVM_SUFFIX%% %%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/cindex.py %%PYCLANG%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/clang/enumerations.py %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/__init__.py -%%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%.so +%%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%.so %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py %%LLDB%%llvm%%LLVM_SUFFIX%%/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py