diff options
Diffstat (limited to 'devel/openmp')
| -rw-r--r-- | devel/openmp/Makefile | 4 | ||||
| -rw-r--r-- | devel/openmp/distinfo | 6 | ||||
| -rw-r--r-- | devel/openmp/files/patch-bug32279 | 27 | ||||
| -rw-r--r-- | devel/openmp/files/patch-runtime_cmake_LibompHandleFlags.cmake | 19 | ||||
| -rw-r--r-- | devel/openmp/files/patch-runtime_src_kmp__runtime.cpp | 11 | ||||
| -rw-r--r-- | devel/openmp/files/patch-runtime_tools_check-depends.pl | 14 |
6 files changed, 38 insertions, 43 deletions
diff --git a/devel/openmp/Makefile b/devel/openmp/Makefile index 25b0d7e25124..b2d5bb2e8023 100644 --- a/devel/openmp/Makefile +++ b/devel/openmp/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= openmp -DISTVERSION= 8.0.0 +DISTVERSION= 9.0.0 DISTVERSIONSUFFIX= .src -PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://llvm.org/releases/${DISTVERSION}/ @@ -20,6 +19,7 @@ ONLY_FOR_ARCHS= amd64 i386 powerpc64 USES= cmake compiler:c++11-lib perl5 tar:xz USE_PERL5= build USE_LDCONFIG= yes +TEST_TARGET= libomp-micro-tests PLIST_FILES= include/omp.h \ include/ompt.h \ include/omp-tools.h \ diff --git a/devel/openmp/distinfo b/devel/openmp/distinfo index 8c1d62a75839..feb614e987a6 100644 --- a/devel/openmp/distinfo +++ b/devel/openmp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547724717 -SHA256 (openmp-8.0.0.src.tar.xz) = f7b1705d2f16c4fc23d6531f67d2dd6fb78a077dd346b02fed64f4b8df65c9d5 -SIZE (openmp-8.0.0.src.tar.xz) = 934384 +TIMESTAMP = 1548690178 +SHA256 (openmp-9.0.0.src.tar.xz) = 9979eb1133066376cc0be29d1682bc0b0e7fb541075b391061679111ae4d3b5b +SIZE (openmp-9.0.0.src.tar.xz) = 939036 diff --git a/devel/openmp/files/patch-bug32279 b/devel/openmp/files/patch-bug32279 deleted file mode 100644 index e22a49226ca1..000000000000 --- a/devel/openmp/files/patch-bug32279 +++ /dev/null @@ -1,27 +0,0 @@ ---- runtime/cmake/LibompHandleFlags.cmake.orig 2018-12-10 13:45:00 UTC -+++ runtime/cmake/LibompHandleFlags.cmake -@@ -159,11 +159,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) -- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") -+ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "DragonFly|FreeBSD") - IF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") - libomp_append(libflags_local -lm) - ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") ---- runtime/cmake/LibompMicroTests.cmake.orig 2017-03-16 15:50:48 UTC -+++ runtime/cmake/LibompMicroTests.cmake -@@ -171,7 +171,7 @@ add_custom_command( - add_custom_target(libomp-test-deps DEPENDS test-deps/.success) - set(libomp_expected_library_deps) - if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -- set(libomp_expected_library_deps libc.so.7 libthr.so.3) -+ set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5) - libomp_append(libomp_expected_library_deps libhwloc.so.5 LIBOMP_USE_HWLOC) - elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD") - set(libomp_expected_library_deps libc.so.12 libpthread.so.1 libm.so.0) diff --git a/devel/openmp/files/patch-runtime_cmake_LibompHandleFlags.cmake b/devel/openmp/files/patch-runtime_cmake_LibompHandleFlags.cmake new file mode 100644 index 000000000000..2438fda5d052 --- /dev/null +++ b/devel/openmp/files/patch-runtime_cmake_LibompHandleFlags.cmake @@ -0,0 +1,19 @@ +BFD linker (unlike LLD) drops libm with --as-needed. +https://bugs.llvm.org/show_bug.cgi?id=32279 + +--- runtime/cmake/LibompHandleFlags.cmake.orig 2019-07-12 21:45:36 UTC ++++ 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}) diff --git a/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp b/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp deleted file mode 100644 index 710755e01f6e..000000000000 --- a/devel/openmp/files/patch-runtime_src_kmp__runtime.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- runtime/src/kmp_runtime.cpp.orig 2019-01-15 15:36:53 UTC -+++ runtime/src/kmp_runtime.cpp -@@ -8104,7 +8104,7 @@ __kmp_determine_reduction_method( - - #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS - --#if KMP_OS_LINUX || KMP_OS_WINDOWS || KMP_OS_HURD -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS || KMP_OS_HURD - - // basic tuning - diff --git a/devel/openmp/files/patch-runtime_tools_check-depends.pl b/devel/openmp/files/patch-runtime_tools_check-depends.pl new file mode 100644 index 000000000000..5b6d9440bc92 --- /dev/null +++ b/devel/openmp/files/patch-runtime_tools_check-depends.pl @@ -0,0 +1,14 @@ +Adjust for FreeBSD readelf(1) output. +https://sourceforge.net/p/elftoolchain/tickets/544/ + +--- runtime/tools/check-depends.pl.orig 2019-01-19 10:56:40 UTC ++++ runtime/tools/check-depends.pl +@@ -131,7 +131,7 @@ sub get_deps_readelf($) { + # Parse body. + while ( $i < @bulk ) { + my $line = $bulk[ $i ]; +- if ( $line !~ m{^\s*0x[0-9a-f]+\s+\(([_A-Z0-9]+)\)\s+(.*)\s*$}i ) { ++ if ( $line !~ m{^\s*0x[0-9a-f]+\s+\(?([_A-Z0-9]+)\)?\s+(.*)\s*$}i ) { + parse_error( $tool, @bulk, $i ); + }; # if + my ( $type, $value ) = ( $1, $2 ); |