Date: Tue, 31 Aug 2021 18:46:58 +0000 From: Brooks Davis <brooks@freebsd.org> To: Dima Panov <fluffy@FreeBSD.org> Cc: dev-commits-ports-all@FreeBSD.org, ports-committers@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 827d8ed62ca2 - main - devel/llvm13: update to RC2 Message-ID: <20210831184658.GD3757@spindle.one-eyed-alien.net> In-Reply-To: <420f0ffa-3fcc-47c0-8613-2879a5ac436b@Canary> References: <202108302220.17UMKj20008474@gitrepo.freebsd.org> <420f0ffa-3fcc-47c0-8613-2879a5ac436b@Canary>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Thanks! Update coming soon. I just noticed that I'd failed to turn FLANG on by default when I added it so I'll fix that as well. -- Brooks On Tue, Aug 31, 2021 at 05:46:51PM +0300, Dima Panov wrote: > Moin! > > Flang docs hardly require to use textproc/py-sphinx-markdown-tables, may be useful for basic docs too. > > Quick???n???dirty fix: https://github.com/fluffykhv/freebsd-ports/commit/5ac558d5ff7005426ad02b9f4aee41ddf86782f5 > > -- > Dima. (desktop, kde, x11, office, ports-secteam)@FreeBSD team > (fluffy@FreeBSD.org, https://t.me/dima_panov) > > > On Tuesday, Aug 31, 2021 at 1:20 AM, Brooks Davis <brooks@FreeBSD.org (mailto:brooks@FreeBSD.org)> wrote: > > The branch main has been updated by brooks: > > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=827d8ed62ca2b71e73a7bbb92e13bc4dd42dac77 > > > > commit 827d8ed62ca2b71e73a7bbb92e13bc4dd42dac77 > > Author: Brooks Davis <brooks@FreeBSD.org> > > AuthorDate: 2021-08-30 22:20:28 +0000 > > Commit: Brooks Davis <brooks@FreeBSD.org> > > CommitDate: 2021-08-30 22:20:28 +0000 > > > > devel/llvm13: update to RC2 > > --- > > devel/llvm13/Makefile | 2 +- > > devel/llvm13/distinfo | 6 ++--- > > ...patch-mlir_lib_ExecutionEngine_CRunnerUtils.cpp | 20 ---------------- > > ...enmp_libomptarget_plugins_amdgpu_CMakeLists.txt | 27 ---------------------- > > devel/llvm13/pkg-plist | 24 +++++++++---------- > > 5 files changed, 16 insertions(+), 63 deletions(-) > > > > diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile > > index 2ad888e3f96d..de6b197a0f3b 100644 > > --- a/devel/llvm13/Makefile > > +++ b/devel/llvm13/Makefile > > @@ -1,5 +1,5 @@ > > PORTNAME= llvm > > -DISTVERSION= 13.0.0rc1 > > +DISTVERSION= 13.0.0rc2 > > PORTREVISION= 0 > > CATEGORIES= devel lang > > MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ > > diff --git a/devel/llvm13/distinfo b/devel/llvm13/distinfo > > index 9a219aa042d0..df22eaa7d588 100644 > > --- a/devel/llvm13/distinfo > > +++ b/devel/llvm13/distinfo > > @@ -1,3 +1,3 @@ > > -TIMESTAMP = 1629330173 > > -SHA256 (llvm-project-13.0.0rc1.src.tar.xz) = 164d66fdadcba32260cc1e3363931e898bac50aeb42fe131d0669de1d2b36faf > > -SIZE (llvm-project-13.0.0rc1.src.tar.xz) = 97541252 > > +TIMESTAMP = 1630085619 > > +SHA256 (llvm-project-13.0.0rc2.src.tar.xz) = 62c80357c23630365758656753268949e81ac12c15e077699919713998514e41 > > +SIZE (llvm-project-13.0.0rc2.src.tar.xz) = 97559008 > > diff --git a/devel/llvm13/files/patch-mlir_lib_ExecutionEngine_CRunnerUtils.cpp b/devel/llvm13/files/patch-mlir_lib_ExecutionEngine_CRunnerUtils.cpp > > deleted file mode 100644 > > index 747383ac3bc0..000000000000 > > --- a/devel/llvm13/files/patch-mlir_lib_ExecutionEngine_CRunnerUtils.cpp > > +++ /dev/null > > @@ -1,20 +0,0 @@ > > ---- mlir/lib/ExecutionEngine/CRunnerUtils.cpp.orig > > -+++ mlir/lib/ExecutionEngine/CRunnerUtils.cpp > > -@@ -15,10 +15,14 @@ > > - #include "mlir/ExecutionEngine/CRunnerUtils.h" > > - > > - #ifndef _WIN32 > > --#include <alloca.h> > > --#include <sys/time.h> > > -+# if defined(__FreeBSD__) || defined(__NetBSD__) > > -+# include <cstdlib> > > -+# else > > -+# include <alloca.h> > > -+# endif > > -+# include <sys/time.h> > > - #else > > --#include "malloc.h" > > -+# include "malloc.h" > > - #endif // _WIN32 > > - > > - #include <cinttypes> > > diff --git a/devel/llvm13/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt b/devel/llvm13/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt > > deleted file mode 100644 > > index 08c9e7ce305e..000000000000 > > --- a/devel/llvm13/files/patch-openmp_libomptarget_plugins_amdgpu_CMakeLists.txt > > +++ /dev/null > > @@ -1,27 +0,0 @@ > > ---- openmp/libomptarget/plugins/amdgpu/CMakeLists.txt.orig > > -+++ openmp/libomptarget/plugins/amdgpu/CMakeLists.txt > > -@@ -78,6 +78,15 @@ > > - # When we build for debug, OPENMP_LIBDIR_SUFFIX get set to -debug > > - install(TARGETS omptarget.rtl.amdgpu LIBRARY DESTINATION "lib${OPENMP_LIBDIR_SUFFIX}") > > - > > -+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") > > -+ # On FreeBSD, the 'environ' symbol is undefined at link time, but resolved by > > -+ # the dynamic linker at runtime. Therefore, allow the symbol to be undefined > > -+ # when creating a shared library. > > -+ set(LDFLAGS_UNDEFINED "-Wl,--allow-shlib-undefined") > > -+else() > > -+ set(LDFLAGS_UNDEFINED "-Wl,-z,defs") > > -+endif() > > -+ > > - set_property(TARGET omptarget.rtl.amdgpu PROPERTY INSTALL_RPATH "$ORIGIN") > > - target_link_libraries( > > - omptarget.rtl.amdgpu > > -@@ -88,7 +97,7 @@ > > - ${LIBOMPTARGET_DEP_LIBELF_LIBRARIES} > > - ${OPENMP_PTHREAD_LIB} > > - "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports" > > -- "-Wl,-z,defs" > > -+ ${LDFLAGS_UNDEFINED} > > - ) > > - > > - if (LLVM_BINARY_DIR) > > diff --git a/devel/llvm13/pkg-plist b/devel/llvm13/pkg-plist > > index 20134f6b85e0..74f36135758f 100644 > > --- a/devel/llvm13/pkg-plist > > +++ b/devel/llvm13/pkg-plist > > @@ -4483,8 +4483,8 @@ llvm%%LLVM_SUFFIX%%/lib/cmake/llvm/VersionFromVCS.cmake > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/cmake/mlir/MLIRTargets-%%CMAKE_BUILD_TYPE%%.cmake > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/cmake/mlir/MLIRTargets.cmake > > %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/cmake/openmp/FindOpenMPTarget.cmake > > -llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%git.so > > -llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%git.so > > +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_MAJOR%%.so > > +llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%LLVM_RELEASE%%.so > > llvm%%LLVM_SUFFIX%%/lib/libLLVM.so > > llvm%%LLVM_SUFFIX%%/lib/libLLVMAggressiveInstCombine.a > > llvm%%LLVM_SUFFIX%%/lib/libLLVMAnalysis.a > > @@ -4563,9 +4563,9 @@ llvm%%LLVM_SUFFIX%%/lib/libLLVMWindowsManifest.a > > llvm%%LLVM_SUFFIX%%/lib/libLLVMXRay.a > > llvm%%LLVM_SUFFIX%%/lib/libLLVMipo.a > > llvm%%LLVM_SUFFIX%%/lib/libLTO.so > > -llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git > > +llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%% > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so > > -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.%%LLVM_MAJOR%%git > > +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIR.so.%%LLVM_MAJOR%% > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMX.a > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMXToLLVMIRTranslation.a > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRAMXTransforms.a > > @@ -4741,14 +4741,14 @@ llvm%%LLVM_SUFFIX%%/lib/libLTO.so.%%LLVM_MAJOR%%git > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRX86VectorToLLVMIRTranslation.a > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libMLIRX86VectorTransforms.a > > llvm%%LLVM_SUFFIX%%/lib/libRemarks.so > > -llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%%git > > +llvm%%LLVM_SUFFIX%%/lib/libRemarks.so.%%LLVM_MAJOR%% > > %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher.so > > %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libarcher_static.a > > %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so > > -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%%git > > +%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang-cpp.so.%%LLVM_MAJOR%% > > %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so > > %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_MAJOR%% > > -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%%git > > +%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclang.so.%%LLVM_RELEASE%% > > %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAPINotes.a > > %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangARCMigrate.a > > %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/libclangAST.a > > @@ -4845,14 +4845,14 @@ llvm%%LLVM_SUFFIX%%/lib/libear/ear.c > > %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldWasm.a > > %%LLD%%llvm%%LLVM_SUFFIX%%/lib/liblldYAML.a > > %%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so > > -%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_MAJOR%%git > > -%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%%git > > +%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_MAJOR%% > > +%%LLDB%%llvm%%LLVM_SUFFIX%%/lib/liblldb.so.%%LLVM_RELEASE%% > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so > > -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.%%LLVM_MAJOR%%git > > +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_async_runtime.so.%%LLVM_MAJOR%% > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so > > -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.%%LLVM_MAJOR%%git > > +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_c_runner_utils.so.%%LLVM_MAJOR%% > > %%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so > > -%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.%%LLVM_MAJOR%%git > > +%%MLIR%%llvm%%LLVM_SUFFIX%%/lib/libmlir_runner_utils.so.%%LLVM_MAJOR%% > > %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomp.so > > %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.rtl.amdgpu.so > > %%OPENMP%%llvm%%LLVM_SUFFIX%%/lib/libomptarget.so [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJhLnkhAAoJEKzQXbSebgfAomAIAIyDBw36tA/RNCtqxuV9sSUz nUKlFSCoWSKgd/SMjcm4j7n+C0SGphpmj1RkKGx2KKuZZEJmHNZqh4y/DpljMpj8 dQrI0zWK0fQvBNlRnW6cmg413k4W347z8TbSdzzSIXWB9QslMzOerS3ChM9wq/Iw sFqAtvDG6OhBCucvbOL2SVX05OVfmX474yRGCAGG7jd1XtBDxquW3GdavYXtztpj mfU62UZQYgwIeI9YhqL2//MkR7u/JXt/xqXrEmU5VVhU4I10WyzYjZ9taXFSpo/J Lu/6cDhW6QETQ2Du3aT0JDWd7fZoSpgCbRrTvaAO7/+PLFfaBBjodeh3txL3+kA= =N6Q6 -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210831184658.GD3757>