From nobody Mon Jan 30 23:39:36 2023 X-Original-To: dev-commits-ports-all@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 4P5Pm92Z1pz3bT6w; Mon, 30 Jan 2023 23:39:37 +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 4P5Pm91GBQz4P8Z; Mon, 30 Jan 2023 23:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675121977; 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=st5ZrEUqU7WLwtkOhYC3M+dc9LfBq5p0IfEysRXhJEw=; b=Z4KdLTG0uhaFTjOXxJUkJT7fwslTb6KbqlIQpI5HGy3+BpON9ElMKy2A/mEMJcmpK2xCOq nRWp4lmzF5ErFspFPFew8FCgM0yqrY4bHZldyVuOyIR8GVD2sKervFqOHGm8ffuFNZLqtn 2xVgGpJzTCWVEGPqLk780FElkzyL1nRGwqjd6oVC4jV1EQUDkcDNhw8qBMver6cKwWnQgQ kyJxU5q+AWNi7cQkXyb7M1i4IY6FpOsguXPnwatzZAehx2+8+pZq3ZFVnjXolWx4vVBEoP uyxbB5ZOvY+kjDFvaxf5rzrTuOe5UPA4req2OcBuLyVG6T3ebnub1C7gTTSmKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675121977; 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=st5ZrEUqU7WLwtkOhYC3M+dc9LfBq5p0IfEysRXhJEw=; b=GFDPV4W3x7QE9dlw82xCzA6y+XucZtljYLFTaMS8VmH5YOqZdz/JkaJfiP7qcCkMvCIWaK WW25SUeQ98Vc3v8C2bi41lUkKvPxatBwjm55pcGPUUPppodMlxoffjrmAcgzvm7rX6uZ0m GI/dbVZA1hvJ1VMXZfOAPHKUARJotHXadMF+f8z9+un0kLc5D5YIP96bnzhu+HQFk5TEbk ZjJmJeBwQ+0IUfu0u2Qo6PB1LV4uOzQJvmlbqXwmbwfH/ffRs39nVJevgdYqGxbPoTTwTJ 7sGc2vtUpf23/6NJl5Zs2e6IDKeM266uM/8EyVgkygAr7wPDwQGws3gyDxOIDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675121977; a=rsa-sha256; cv=none; b=ItYXCr3Mz6jMCL8HtV3oYU5jG8sSs/IvWAo+mafr+T2sZmDIjn5ozsssaLY5jcFQfOoaXj W6bLbDj62umBX5H3N954SDjFqo6HtnTCMlrDD5MCo8xHy734assE2lzu7AQz4cyoy3bl7g mON7MBrG0bWZS2fEbfdQ0JLAt3GPaDjDaSr1caBhy1a7RuzUTPqmEamGhigCUr9o+QddMm eDgSy825t6YYGaN1M+Je2Jor9F6RN0J8rHm8licFhEf0qQ213GlwQ4zQAyFbIQBE+fSM1i CmBhb3Y4oNkcjydinAA4NTu1zOhWrE+hfUZ2GLU3Hi76XsFGVsk+3syaRdBG8g== 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 4P5Pm86mf2zS6m; Mon, 30 Jan 2023 23:39:36 +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 30UNdaph073702; Mon, 30 Jan 2023 23:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UNda2Z073701; Mon, 30 Jan 2023 23:39:36 GMT (envelope-from git) Date: Mon, 30 Jan 2023 23:39:36 GMT Message-Id: <202301302339.30UNda2Z073701@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: 6629f8d3d65b - main - devel/llvm15: fix packaging with debug python List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 6629f8d3d65b6f010d2bd1012c847c47ab66f242 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=6629f8d3d65b6f010d2bd1012c847c47ab66f242 commit 6629f8d3d65b6f010d2bd1012c847c47ab66f242 Author: Brooks Davis AuthorDate: 2023-01-30 23:38:36 +0000 Commit: Brooks Davis CommitDate: 2023-01-30 23:38:36 +0000 devel/llvm15: 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/llvm15/Makefile | 3 ++- devel/llvm15/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 7401e536d3e1..6fa0254c0d9a 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -170,6 +170,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 @@ -703,7 +704,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/llvm15/pkg-plist b/devel/llvm15/pkg-plist index 6632bb4aad85..aa17d715ff74 100644 --- a/devel/llvm15/pkg-plist +++ b/devel/llvm15/pkg-plist @@ -141,7 +141,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