From nobody Fri Mar 22 17:45:09 2024 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 4V1V8j4gP8z5FRPl; Fri, 22 Mar 2024 17:45:09 +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 4V1V8j3nxRz4jrb; Fri, 22 Mar 2024 17:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711129509; 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=pQ2xNIlRQIn2Gx90r56+UDgiyrB4XT0V+/aAsRymkio=; b=KEs6xNAplr29Hl4r1QQ4Yyg29ASPxlH/6Rnno/svh1jQDYXlRT/KrftuWE9dAJxb2AKOq7 bp7rKI5TJ9NuUZGDADIvDpkvZxK5UCDrrUJLT1HpcBlKsB2OpYHVhVEY5Y1Ohfn69fHUko yZx+M7g1V0J9QZ1HY4tNgSf6a8ppVeUOa7mM4qsU0NnYrpzQeMbyCjVuHdUK88fWaDQYXT WI0O5hiemHLk8Il8qGXq9hr7LoqpiIPDbp0To68iQ7DIWR/Rq/Q4eIMcJ6JtLJf64DPhM7 jK7nGkN3ZmxZ7YjT0JHp9gd0wVaJ9Rrb3Tj1yJchdzvbd+CXuhwHbr9Gd29vug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711129509; a=rsa-sha256; cv=none; b=I6xILI3Sf+Kpw2uSNY+t/zuhG0knS66IzrrZqN10taN4KuBWniC9wEedULWDtI/ch+eegw IdH/OGDr1WgXib9lqt1ITmgiPvTQ7ZX8GUqe2PCw30lp/zOykQLryrnvZQ4yD1jW524E9X iR3oq7INnxKWKoabPhKhne1SX/KCmlJbUYx8hSJKLsgEgwdpLkQpOgcnVf+ONKk1BF1MnA neAvX4Hwp4yG99CUpNrjXj+9APJ9znY6MgFYYSJ3F91EI14kj3nnEV5573ycw5aqqLoxVn yUNzh30c7GgOc1S8g5q2CUOFnGZK8hB3z1ieDa0YrGirtqeOpN23X0/dS2oRtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711129509; 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=pQ2xNIlRQIn2Gx90r56+UDgiyrB4XT0V+/aAsRymkio=; b=WK94iwLfXUk3M9tht0BQXi7uvpn/ZedOmZB/53i/BFH3hEC5BfjAW1h670gWebgnbyoXiv N7F097aC7QAVpY6JkiZ03B7O+vir7jVJ5GURZy5izk1d68UNFTIyTW9qV4EXGDJboNsikx kLzulXQHgebi2329C1KG/422I/ZYcE1OXDkHgTanqwRrmBoAI6Z/80raBLhjkmTInUgDUL XVo3dVsPzgD346Wvo8ePfbqDHaZnhV0QxIO6peEX4K2DAaqrahT8RcbGt4ouDqFQy437vE g6ND6uvMoEV9PrkyRHN+14MpMFgTsPdoCNRAxxwHWAW1FzMS8UekOsZcOEEq5Q== 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 4V1V8j3PS8z1SRJ; Fri, 22 Mar 2024 17:45:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MHj9M6027389; Fri, 22 Mar 2024 17:45:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MHj9LQ027386; Fri, 22 Mar 2024 17:45:09 GMT (envelope-from git) Date: Fri, 22 Mar 2024 17:45:09 GMT Message-Id: <202403221745.42MHj9LQ027386@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: 49940028250a - main - devel/llvm18: PLIST_SUB improvements [NFC] 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: 49940028250a4fb4beffc5a332fa9c0b612d0a3a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=49940028250a4fb4beffc5a332fa9c0b612d0a3a commit 49940028250a4fb4beffc5a332fa9c0b612d0a3a Author: Brooks Davis AuthorDate: 2024-03-21 23:21:27 +0000 Commit: Brooks Davis CommitDate: 2024-03-22 17:44:59 +0000 devel/llvm18: PLIST_SUB improvements [NFC] Chase changes in library suffixes and fix an overly pesimistic substitution. No functional change, but will reduce plist churn when 19 comes out assuming there aren't further upstream changes in suffixes. --- devel/llvm18/Makefile | 9 ++++++--- devel/llvm18/pkg-plist | 30 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index 7a6e0abfd807..cd0eea7defa2 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -28,7 +28,8 @@ FLAVOR?= ${FLAVORS:[1]} lite_PKGNAMESUFFIX= ${LLVM_SUFFIX}-lite LLVM_RELEASE= ${DISTVERSION:C/rc.*//} -LLVM_MAJOR= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} +LLVM_MAJOR_MINOR=${LLVM_RELEASE:C/\.[0-9]$//} +LLVM_MAJOR= ${LLVM_MAJOR_MINOR:C/\.[0-9]$//} LLVM_SUFFIX= ${LLVM_MAJOR} PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|/\1|} @@ -218,7 +219,8 @@ CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif -PLIST_SUB+= LLVM_MAJOR=${LLVM_MAJOR} \ +PLIST_SUB+= LLVM_MAJOR_MINOR=${LLVM_MAJOR_MINOR} \ + LLVM_MAJOR=${LLVM_MAJOR} \ LLVM_RELEASE=${LLVM_RELEASE} \ LLVM_SUFFIX=${LLVM_SUFFIX} @@ -623,8 +625,9 @@ build-plist: -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \ + -e 's|${LLVM_MAJOR_MINOR:C/\./\\./}|%%LLVM_MAJOR_MINOR%%|' \ -e 's|/${LLVM_MAJOR}/|/%%LLVM_MAJOR%%/|' \ - -e 's|\([-./]\)${LLVM_MAJOR:C/\./\\./}$$|\1%%LLVM_MAJOR%%|' \ + -e 's|\([-./]\)${LLVM_MAJOR}|\1%%LLVM_MAJOR%%|' \ | ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ diff --git a/devel/llvm18/pkg-plist b/devel/llvm18/pkg-plist index 5cfdf33712f4..106d46fe6187 100644 --- a/devel/llvm18/pkg-plist +++ b/devel/llvm18/pkg-plist @@ -6207,9 +6207,9 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/llvm-driver-template.cpp.in %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libFortran_main.a %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libHLFIRDialect.a %%STATIC_LIBS%%%%FLANG%%llvm%%LLVM_SUFFIX%%/lib/libHLFIRTransforms.a -llvm%%LLVM_SUFFIX%%/lib/libLLVM-18.so +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%.so llvm%%LLVM_SUFFIX%%/lib/libLLVM.so -llvm%%LLVM_SUFFIX%%/lib/libLLVM.so.18.1 +llvm%%LLVM_SUFFIX%%/lib/libLLVM.so.%%LLVM_MAJOR_MINOR%% %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMAsmParser.a @@ -6301,9 +6301,9 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVM.so.18.1 %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a %%STATIC_LIBS%%llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a llvm%%LLVM_SUFFIX%%/lib/libLTO.so -llvm%%LLVM_SUFFIX%%/lib/libLTO.so.18.1 +llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR_MINOR%% %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.%%LLVM_MAJOR_MINOR%% %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUDialect.a %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUToROCDL.a %%STATIC_LIBS%%%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMDGPUTransforms.a @@ -6640,14 +6640,14 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.18.1 %%STATIC_LIBS%%%%POLLY%%llvm%%LLVM_SUFFIX%%/lib/libPolly.a %%STATIC_LIBS%%%%POLLY%%llvm%%LLVM_SUFFIX%%/lib/libPollyISL.a llvm%%LLVM_SUFFIX%%/lib/libRemarks.so -llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.18.1 +llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR_MINOR%% %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher.so %%STATIC_LIBS%%%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.18.1 +%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR_MINOR%% %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so +%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR_MINOR%% %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%% -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.18.1 %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a %%STATIC_LIBS%%%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a @@ -6751,23 +6751,23 @@ llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.18.1 %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldMinGW.a %%STATIC_LIBS%%%%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so +%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_MAJOR_MINOR%% %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%% -%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.18.1 %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_runner_utils.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_runner_utils.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_runner_utils.so.%%LLVM_MAJOR_MINOR%% %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_sme_abi_stubs.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_sme_abi_stubs.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_arm_sme_abi_stubs.so.%%LLVM_MAJOR_MINOR%% %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.%%LLVM_MAJOR_MINOR%% %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.%%LLVM_MAJOR_MINOR%% %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_float16_utils.so.%%LLVM_MAJOR_MINOR%% %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.18.1 +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.%%LLVM_MAJOR_MINOR%% %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so -%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.18.1 +%%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so.%%LLVM_MAJOR_MINOR%% %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/__init__.py %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/analyze.py %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libscanbuild/arguments.py