aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2023-02-23 17:44:33 +0000
committerBrooks Davis <brooks@FreeBSD.org>2023-02-23 17:47:09 +0000
commitb090aac6a0e10f6a86e318fcced118070ca563d3 (patch)
tree618540eea0c71feb6952ba1f5b8de49a78868381
parent7d620af116d9dc8b31cf0833f34245b7b315c748 (diff)
downloadports-b090aac6a0e10f6a86e318fcced118070ca563d3.tar.gz
ports-b090aac6a0e10f6a86e318fcced118070ca563d3.zip
devel/llvm16: 16.0.0rc3
Don't enable FLANG by default and stop installing a link from flang-new to flang. The former has a deliberately obtuse interface intended to prevent casual use. While the community sorts it self out, just stick with that to avoid future confusion. See: https://discourse.llvm.org/t/reviving-rename-flang-new-to-flang
-rw-r--r--devel/llvm16/Makefile6
-rw-r--r--devel/llvm16/distinfo6
-rw-r--r--devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt11
-rw-r--r--devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt11
-rw-r--r--devel/llvm16/pkg-plist1
5 files changed, 5 insertions, 30 deletions
diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index c626f6f239c4..477772b2b24e 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -1,5 +1,5 @@
PORTNAME= llvm
-DISTVERSION= 16.0.0rc2
+DISTVERSION= 16.0.0rc3
PORTREVISION= 0
CATEGORIES= devel lang
MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
@@ -91,7 +91,7 @@ OPTIONS_DEFINE_amd64= GOLD
OPTIONS_DEFINE_powerpc= GOLD
OPTIONS_DEFINE_powerpc64= GOLD
OPTIONS_DEFINE_powerpc64le= GOLD
-OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG COMPILER_RT EXTRAS FLANG LIT LLD LLDB OPENMP PYCLANG
+OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG COMPILER_RT EXTRAS LIT LLD LLDB OPENMP PYCLANG
OPTIONS_DEFAULT_amd64= GOLD
OPTIONS_DEFAULT_powerpc= GOLD
OPTIONS_DEFAULT_powerpc64= GOLD
@@ -516,8 +516,6 @@ post-install-FLANG-on:
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Transforms/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CMakeFiles
${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/CMakeFiles
- ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/flang-new \
- ${STAGEDIR}${LLVM_PREFIX}/bin/flang
post-install-LIT-on:
${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \
diff --git a/devel/llvm16/distinfo b/devel/llvm16/distinfo
index 230136567cd1..dad7c5bd7c45 100644
--- a/devel/llvm16/distinfo
+++ b/devel/llvm16/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675875093
-SHA256 (llvm-project-16.0.0rc2.src.tar.xz) = 2ae53e4d9cdc46e660359a5311f276bd4cb39c310345de951c580a09b4f34861
-SIZE (llvm-project-16.0.0rc2.src.tar.xz) = 117917640
+TIMESTAMP = 1677085118
+SHA256 (llvm-project-16.0.0rc3.src.tar.xz) = 8fa9792a1a04f78d023b87c5e5bd25010d5f73a5c0ae1830e897d85821ee9325
+SIZE (llvm-project-16.0.0rc3.src.tar.xz) = 117914548
diff --git a/devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt b/devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt
deleted file mode 100644
index 5b65cfa95fd8..000000000000
--- a/devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt.orig
-+++ openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt
-@@ -90,7 +90,7 @@
-
- NO_INSTALL_RPATH
- )
--add_dependencies(omptarget.rtl.amdgpu.nextgen omptarget.devicertl.amdgpu)
-+#add_dependencies(omptarget.rtl.amdgpu.nextgen omptarget.devicertl.amdgpu)
-
- target_include_directories(
- omptarget.rtl.amdgpu.nextgen
diff --git a/devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt b/devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt
deleted file mode 100644
index d44d63183f1d..000000000000
--- a/devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- openmp/libomptarget/plugins/amdgpu/CMakeLists.txt.orig
-+++ openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
-@@ -92,7 +92,7 @@
-
- NO_INSTALL_RPATH
- )
--add_dependencies(omptarget.rtl.amdgpu omptarget.devicertl.amdgpu)
-+#add_dependencies(omptarget.rtl.amdgpu omptarget.devicertl.amdgpu)
-
- target_include_directories(
- omptarget.rtl.amdgpu
diff --git a/devel/llvm16/pkg-plist b/devel/llvm16/pkg-plist
index 0f3a0ad7e2ed..730f574ae019 100644
--- a/devel/llvm16/pkg-plist
+++ b/devel/llvm16/pkg-plist
@@ -198,7 +198,6 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil
%%FLANG%%llvm%%LLVM_SUFFIX%%/bin/f18-parse-demo
%%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/find-all-symbols
%%FLANG%%llvm%%LLVM_SUFFIX%%/bin/fir-opt
-%%FLANG%%llvm%%LLVM_SUFFIX%%/bin/flang
%%FLANG%%llvm%%LLVM_SUFFIX%%/bin/flang-new
%%FLANG%%llvm%%LLVM_SUFFIX%%/bin/flang-to-external-fc
%%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format