From 9b01e80d28ad1fa918344248ccb295cc4bdec194 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sun, 22 Sep 2019 18:12:42 +0000 Subject: [PATCH] devel/llvm90: update to 9.0.0 - Enable LLD_LINK on i386 - Fix -fopenmp with BFD linker Changes: https://github.com/llvm/llvm-project/compare/llvmorg-9.0.0-rc4...llvmorg-9.0.0 Changes: http://lists.llvm.org/pipermail/llvm-announce/2019-September/000085.html PR: 240730 240737 Approved by: brooks (maintainer) --- devel/llvm90/Makefile | 11 +++------ devel/llvm90/distinfo | 30 ++++++++++++------------ devel/llvm90/files/openmp/patch-bug32279 | 16 +++++++++++++ 3 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 devel/llvm90/files/openmp/patch-bug32279 diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index 5bdd52eb728a..827aa1a3c2b7 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -1,14 +1,9 @@ # $FreeBSD$ PORTNAME= llvm -DISTVERSION= 9.0.0rc4 -PORTREVISION= 1 +DISTVERSION= 9.0.0 CATEGORIES= devel lang -.if ${DISTVERSION:M*rc*} -MASTER_SITES= http://prereleases.llvm.org/${LLVM_RELEASE}/${RCDIR} -.else -MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ -.endif +MASTER_SITES= http://${RCDIR:C/.+/pre/}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} DISTNAME= ${PORTNAME}-${DISTVERSION}.src DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX} @@ -72,7 +67,7 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc64= OPENMP OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLDB PYCLANG OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD LLD_LINK OPENMP -OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP +OPTIONS_DEFAULT_i386= COMPILER_RT LLD_LINK OPENMP OPTIONS_DEFAULT_powerpc64= OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD diff --git a/devel/llvm90/distinfo b/devel/llvm90/distinfo index 640f425e5e61..f663a54efb1e 100644 --- a/devel/llvm90/distinfo +++ b/devel/llvm90/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1568188104 -SHA256 (llvm-9.0.0rc4.src.tar.xz) = b7a4cca6dc7b7c9bf0766be389afcba1ee1a229cc77cf39741e78e67dfadb0d0 -SIZE (llvm-9.0.0rc4.src.tar.xz) = 32998872 -SHA256 (cfe-9.0.0rc4.src.tar.xz) = a134a6fe858a29c7ccf6113504aa423277c5f10fa2b51e8e5202643b754a760d -SIZE (cfe-9.0.0rc4.src.tar.xz) = 13532608 -SHA256 (compiler-rt-9.0.0rc4.src.tar.xz) = 409c60d812e5e5445ccf6af59edfb1ef412ba8aa7728399fed980a37ed2c67f3 -SIZE (compiler-rt-9.0.0rc4.src.tar.xz) = 1993372 -SHA256 (clang-tools-extra-9.0.0rc4.src.tar.xz) = b1fef1828ac0a09911a32452fdd7cac82260474ee7b1f11801db22fe2136d7c2 -SIZE (clang-tools-extra-9.0.0rc4.src.tar.xz) = 2183936 -SHA256 (lld-9.0.0rc4.src.tar.xz) = 9b3e87edf2a162fc6fdc2c2b3e5506044c00da125f934efc6ec228185910b7bc -SIZE (lld-9.0.0rc4.src.tar.xz) = 1100616 -SHA256 (lldb-9.0.0rc4.src.tar.xz) = 90b425a26ae0e3c73f0811938ea59307e92c548137647365ce6106b26cff7e1e -SIZE (lldb-9.0.0rc4.src.tar.xz) = 9848692 -SHA256 (openmp-9.0.0rc4.src.tar.xz) = d6eb006d98336f7a7dfa908ce73431ef734bf9c0be5cec6c0ae5cb45996a0ac3 -SIZE (openmp-9.0.0rc4.src.tar.xz) = 938944 +TIMESTAMP = 1568898596 +SHA256 (llvm-9.0.0.src.tar.xz) = d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84 +SIZE (llvm-9.0.0.src.tar.xz) = 32994768 +SHA256 (cfe-9.0.0.src.tar.xz) = 7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610 +SIZE (cfe-9.0.0.src.tar.xz) = 13533024 +SHA256 (compiler-rt-9.0.0.src.tar.xz) = 56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e +SIZE (compiler-rt-9.0.0.src.tar.xz) = 1993084 +SHA256 (clang-tools-extra-9.0.0.src.tar.xz) = ea1c86ce352992d7b6f6649bc622f6a2707b9f8b7153e9f9181a35c76aa3ac10 +SIZE (clang-tools-extra-9.0.0.src.tar.xz) = 2183436 +SHA256 (lld-9.0.0.src.tar.xz) = 31c6748b235d09723fb73fea0c816ed5a3fab0f96b66f8fbc546a0fcc8688f91 +SIZE (lld-9.0.0.src.tar.xz) = 1100608 +SHA256 (lldb-9.0.0.src.tar.xz) = 1e4c2f6a1f153f4b8afa2470d2e99dab493034c1ba8b7ffbbd7600de016d0794 +SIZE (lldb-9.0.0.src.tar.xz) = 9846624 +SHA256 (openmp-9.0.0.src.tar.xz) = 9979eb1133066376cc0be29d1682bc0b0e7fb541075b391061679111ae4d3b5b +SIZE (openmp-9.0.0.src.tar.xz) = 939036 diff --git a/devel/llvm90/files/openmp/patch-bug32279 b/devel/llvm90/files/openmp/patch-bug32279 new file mode 100644 index 000000000000..31616e309738 --- /dev/null +++ b/devel/llvm90/files/openmp/patch-bug32279 @@ -0,0 +1,16 @@ +--- projects/openmp/runtime/cmake/LibompHandleFlags.cmake.orig 2019-07-12 21:45:36 UTC ++++ projects/openmp/runtime/cmake/LibompHandleFlags.cmake +@@ -158,11 +158,11 @@ function(libomp_get_libflags libflags) + if(${IA32}) + libomp_append(libflags_local -lirc_pic LIBOMP_HAVE_IRC_PIC_LIBRARY) + endif() +- if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly|FreeBSD") + libomp_append(libflags_local "-Wl,--no-as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG) + libomp_append(libflags_local "-lm") + libomp_append(libflags_local "-Wl,--as-needed" LIBOMP_HAVE_AS_NEEDED_FLAG) +- elseif(${CMAKE_SYSTEM_NAME} MATCHES "(Free|Net)BSD") ++ elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + libomp_append(libflags_local -lm) + endif() + set(libflags_local ${libflags_local} ${LIBOMP_LIBFLAGS})