From nobody Fri Jan 27 23:54:23 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 4P3ZDb2YNzz3bJV9; Fri, 27 Jan 2023 23:54:23 +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 4P3ZDb1njVz3M4M; Fri, 27 Jan 2023 23:54:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674863663; 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=TgqeID4dVNbx9/w7afltTvnUDlWIdmxVC5V981RuErE=; b=ZJYmvKwttbEP/uJRdxK5DrJetDMaWwQjb05I1sDOOxhTKmCuQ+yQWVk3uUtptMr1sXhPtC Uc18UfRNZrXwRk3A9d9voJbWMwQHl6fF89VDBSkV/JzfEvNd19TO4KOJk3Ltap7B7HcddY NNLx7fDM0WP9iI+SwBxZkZ7Tp7evTJ4HqQ/Aj0ZVMw84MVKWFx8zWm5ABG2hY3FpTh+Nux HCKE2uPHf6sMUTFd2e8Q4fQ9SDbvtyfIYC42+cAIjyYQ0sMUkNJUQ6rjS9BaOk4LYmBs9L tKNe9H18/VEurom+Yc6ckp/A1uZZPvzXil9RkuiKA/AgTQuRVKXg/e5DJsmfrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674863663; 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=TgqeID4dVNbx9/w7afltTvnUDlWIdmxVC5V981RuErE=; b=D2Jwq99jRAbI17a6m4aAs71Ezzmcl73pc88OjigVK4e2QwH0h5sh8tL1fpMM7kb6xn6PuC TR0WNOqugu0tARoF0F0pazI0m+LJQvPHtbPkpkadVNZ+cM0bWtEu6R2KxML/rnMZPb3Yqi fLlAIxp2LrwyqKQ4Kw7vFTs2TlPNal0bGvhO9iBq/90iWt6q2KOjLH5IoiRsESkj0AXD4r vJmbjB9SiGkAS5f3RTrZFQJoTU1r/RBTSDC6FdK8xDFBhSjz9aWsMjxxxE4Lum0XHh9mn6 IrKv3DV2xvmLjOdlDCfLgFg4Davf7uQ+aBgX+PFIkqDxFV71fyhwKIVFoGhXOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674863663; a=rsa-sha256; cv=none; b=O+VfyKa/kklPssJABWjYNQsYd12r5y1CgVkvxPqsulD3AO8C8eNGk5p6U6JbYT3Zm7hYVj GTV6M+dGkVO7HCQEu7rP/4nTHtsO1uPPrnlz6UQBqYi9c7J/CtJ9mhlOiPb0xx3fllBWzK 8MkpgHYGc2+KGa83XcRwmEEsomsQ1LRL7C8gp71qEFMEemdXg1g4UAd5Z+U2+qJe03ugWu OVW9IaIcswMxmNrDrLthyM/UZeA7Enrk6I5ZKNe5CdizguQP9Zz7RfRDyvseLv9sH5YbKm Cd7h8QoaMSMuN/EpjCYD8WPR4WO6RjNjBMeAHfGq5jArbovOnPu4J3rFwwuxGA== 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 4P3ZDb0pCVzT0D; Fri, 27 Jan 2023 23:54:23 +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 30RNsN9w013154; Fri, 27 Jan 2023 23:54:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RNsN6n013153; Fri, 27 Jan 2023 23:54:23 GMT (envelope-from git) Date: Fri, 27 Jan 2023 23:54:23 GMT Message-Id: <202301272354.30RNsN6n013153@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: aeb2ce7f4b40 - main - devel/llvm-devel: 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: aeb2ce7f4b401deff1b71280d147f3d2c2b5fafd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=aeb2ce7f4b401deff1b71280d147f3d2c2b5fafd commit aeb2ce7f4b401deff1b71280d147f3d2c2b5fafd Author: Brooks Davis AuthorDate: 2023-01-27 23:53:39 +0000 Commit: Brooks Davis CommitDate: 2023-01-27 23:53:40 +0000 devel/llvm-devel: 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/llvm-devel/Makefile | 3 ++- devel/llvm-devel/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 5e5806bcf893..137e0dad1928 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -151,6 +151,7 @@ LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG +LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit LLDB_USE= GNOME=libxml2 LLDB_VARS= _USES_PYTHON=python:3.6+ @@ -476,7 +477,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|${PORTVERSION}|%%PORTVERSION%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 547cef1b4369..8b355594199b 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -137,7 +137,7 @@ bin/sancov-devel %%LIT%%bin/llvm-lit-devel %%LIT%%llvm-devel/bin/llvm-lit %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/__init__.py -%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%.so +%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%.so %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py