diff options
author | Aric Belsito <lluixhi@gmail.com> | 2017-12-21 15:20:19 -0800 |
---|---|---|
committer | Aric Belsito <lluixhi@gmail.com> | 2017-12-21 15:20:19 -0800 |
commit | d78acc08a092f22c5c38531ba4912b6c156bd269 (patch) | |
tree | cfc4b547bfdc2a072dd1727ae5c5dd5cf4945847 /sys-libs | |
parent | app-emulation/qemu: version bump to 2.10.1-r1 (diff) | |
download | musl-d78acc08a092f22c5c38531ba4912b6c156bd269.tar.gz musl-d78acc08a092f22c5c38531ba4912b6c156bd269.tar.bz2 musl-d78acc08a092f22c5c38531ba4912b6c156bd269.zip |
sys-libs/libomp: version bump to 5.0.1
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/libomp/Manifest | 6 | ||||
-rw-r--r-- | sys-libs/libomp/files/4.0.0/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch | 94 | ||||
-rw-r--r-- | sys-libs/libomp/libomp-3.9.1.ebuild | 4 | ||||
-rw-r--r-- | sys-libs/libomp/libomp-4.0.1.ebuild | 10 | ||||
-rw-r--r-- | sys-libs/libomp/libomp-5.0.1.ebuild (renamed from sys-libs/libomp/libomp-5.0.0.ebuild) | 4 |
5 files changed, 11 insertions, 107 deletions
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index de453194..a83b285f 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,3 +1,3 @@ -DIST openmp-3.9.1.src.tar.xz 2031588 SHA256 d23b324e422c0d5f3d64bae5f550ff1132c37a070e43c7ca93991676c86c7766 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b WHIRLPOOL b6ec75d4f9d2b86bb8e2927791cb46e61ff8657fc21f9e0ba9893d81d3382522aca330564f3156c1fbbf765de0499e875e41e11199abe2da8ed1bef057d5e8d8 -DIST openmp-4.0.1.src.tar.xz 2275240 SHA256 ec693b170e0600daa7b372240a06e66341ace790d89eaf4a843e8d56d5f4ada4 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf WHIRLPOOL 102f4b6984e6bc4dc08349e7f1f0ff31646bad923018cfd342e0bee760d8b1036f0c54c565af3b0730c470d584e37ed905bcbfa1ffc2325dafa0a02d91088b05 -DIST openmp-5.0.0.src.tar.xz 2074004 SHA256 c0ef081b05e0725a04e8711d9ecea2e90d6c3fbb1622845336d3d095d0a3f7c5 SHA512 038cc1d262414fac9a05eabdce97b21eb04fc1b3609d07f8da2c9da6b1aaa143f8b26953cb799e7dde82f708103539fe03fe939ba7323a71bd3e9e3925bd5513 WHIRLPOOL e32436cc925173db2f58dc0b454ed046c733877edce3383da0a621ea90e9c30d9e45c0063451feb9b0dc95102893db02832d97bfb3a200e3440e4cad7fb9720a +DIST openmp-3.9.1.src.tar.xz 2031588 BLAKE2B feafb94a832ec48a67d6e00720724dcecb533a4a09e0d69462af33e13454b20393aa21fabb062c362824cdfbee712db1030732271e4cd49085fa69cff9800835 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b +DIST openmp-4.0.1.src.tar.xz 2275240 BLAKE2B e63cf670c4cd2678afc4d7b96be85c3d157bf91a69510f980d9a0a07f61b449b22ff28d63753f32e63afedb4a7077c662a633f689a660b5047a83bcf1fb7f009 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf +DIST openmp-5.0.1.src.tar.xz 2075472 BLAKE2B a4da4726a17dc0fd083e11fe1bebf446978137aa4453000e8fea950021fff091a818246f0817dd60ce67353d3f7d75ab8fec2b9e955389d9c94e195945efda50 SHA512 4493b918fd83ef26e2b3f3429d1b00d722328e4c9697ac7625a390834f6e88ada8e5b02ce0ecb4771129207b1b81a9d171f4599ab9388762a3c6db0afc499ff4 diff --git a/sys-libs/libomp/files/4.0.0/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch b/sys-libs/libomp/files/4.0.0/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch deleted file mode 100644 index 68817558..00000000 --- a/sys-libs/libomp/files/4.0.0/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 7bd70635240f69fcd4da4d98a4aca8aaa779dd11 Mon Sep 17 00:00:00 2001 -From: Michal Gorny <mgorny@gentoo.org> -Date: Fri, 24 Feb 2017 22:15:24 +0000 -Subject: [PATCH] [test] Try to link -latomic to provide atomics when available - -When using -rtlib=libgcc, the fallback implementation of __atomic_* -builtins is provided via libatomic (included in GCC). However, neither -GCC itself nor clang link libatomic implicitly, and it seems that GCC -upstream expects projects to link it explicitly as necessary. - -Since compiler-rt provides __atomic_* builtins directly in the main -library, check if they are provided by the default libraries first. -If they are not, check if -latomic is available to provide them -and add explicit -latomic for tests in this case. - -This fixes unresolved __atomic_load() references when running openmp -tests on i386 with libgcc backend. - -Differential Revision: https://reviews.llvm.org/D30083 - -git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@296183 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - runtime/test/CMakeLists.txt | 13 +++++++++++++ - runtime/test/lit.cfg | 2 ++ - runtime/test/lit.site.cfg.in | 2 +- - 3 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/runtime/test/CMakeLists.txt b/runtime/test/CMakeLists.txt -index 8162855..88c02c8 100644 ---- a/runtime/test/CMakeLists.txt -+++ b/runtime/test/CMakeLists.txt -@@ -1,6 +1,7 @@ - # CMakeLists.txt file for unit testing OpenMP Library - include(FindPythonInterp) - include(CheckTypeSize) -+include(CheckFunctionExists) - include(CheckLibraryExists) - - if(NOT PYTHONINTERP_FOUND) -@@ -11,6 +12,17 @@ endif() - - # Some tests use math functions - check_library_exists(m sqrt "" LIBOMP_HAVE_LIBM) -+# When using libgcc, -latomic may be needed for atomics -+# (but when using compiler-rt, the atomics will be built-in) -+# Note: we can not check for __atomic_load because clang treats it -+# as special built-in and that breaks CMake checks -+check_function_exists(__atomic_load_1 LIBOMP_HAVE_BUILTIN_ATOMIC) -+if(NOT LIBOMP_HAVE_BUILTIN_ATOMIC) -+ check_library_exists(atomic __atomic_load_1 "" LIBOMP_HAVE_LIBATOMIC) -+else() -+ # not needed -+ set(LIBOMP_HAVE_LIBATOMIC 0) -+endif() - - macro(pythonize_bool var) - if (${var}) -@@ -25,6 +37,7 @@ pythonize_bool(LIBOMP_OMPT_SUPPORT) - pythonize_bool(LIBOMP_OMPT_BLAME) - pythonize_bool(LIBOMP_OMPT_TRACE) - pythonize_bool(LIBOMP_HAVE_LIBM) -+pythonize_bool(LIBOMP_HAVE_LIBATOMIC) - - set(LIBOMP_TEST_CFLAGS "" CACHE STRING - "Extra compiler flags to send to the test compiler") -diff --git a/runtime/test/lit.cfg b/runtime/test/lit.cfg -index 7f18da4..bef61d4 100644 ---- a/runtime/test/lit.cfg -+++ b/runtime/test/lit.cfg -@@ -52,6 +52,8 @@ config.test_cflags = config.test_openmp_flag + \ - libs = "" - if config.has_libm: - libs += " -lm" -+if config.has_libatomic: -+ libs += " -latomic" - - # Allow XFAIL to work - config.target_triple = [ ] -diff --git a/runtime/test/lit.site.cfg.in b/runtime/test/lit.site.cfg.in -index 448132e..b0d57ce 100644 ---- a/runtime/test/lit.site.cfg.in -+++ b/runtime/test/lit.site.cfg.in -@@ -12,7 +12,7 @@ config.hwloc_library_dir = "@LIBOMP_HWLOC_LIBRARY_DIR@" - config.using_hwloc = @LIBOMP_USE_HWLOC@ - config.has_ompt = @LIBOMP_OMPT_SUPPORT@ and @LIBOMP_OMPT_BLAME@ and @LIBOMP_OMPT_TRACE@ - config.has_libm = @LIBOMP_HAVE_LIBM@ -+config.has_libatomic = @LIBOMP_HAVE_LIBATOMIC@ - - # Let the main config do the real work. - lit_config.load_config(config, "@LIBOMP_BASE_DIR@/test/lit.cfg") -- --- -2.12.0 - diff --git a/sys-libs/libomp/libomp-3.9.1.ebuild b/sys-libs/libomp/libomp-3.9.1.ebuild index c575e28b..58cbcf29 100644 --- a/sys-libs/libomp/libomp-3.9.1.ebuild +++ b/sys-libs/libomp/libomp-3.9.1.ebuild @@ -9,8 +9,8 @@ inherit cmake-multilib MY_P=openmp-${PV} DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="http://openmp.llvm.org" -SRC_URI="http://llvm.org/releases/${PV}/${MY_P}.src.tar.xz" +HOMEPAGE="https://openmp.llvm.org" +SRC_URI="https://llvm.org/releases/${PV}/${MY_P}.src.tar.xz" # Additional licenses: # - MIT-licensed Intel code, diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild index 9608450e..6ab4db15 100644 --- a/sys-libs/libomp/libomp-4.0.1.ebuild +++ b/sys-libs/libomp/libomp-4.0.1.ebuild @@ -11,8 +11,8 @@ PYTHON_COMPAT=( python2_7 ) inherit cmake-multilib python-any-r1 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="http://openmp.llvm.org" -SRC_URI="http://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz" +HOMEPAGE="https://openmp.llvm.org" +SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz" # Additional licenses: # - MIT-licensed Intel code, @@ -20,7 +20,7 @@ SRC_URI="http://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz" LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="hwloc ompt test" RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )" @@ -51,10 +51,10 @@ pkg_setup() { src_prepare() { # fix atomic tests with gcc - eapply "${FILESDIR}"/4.0.0/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch + eapply "${FILESDIR}"/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch eapply "${FILESDIR}"/${PN}-4.0.0-use-va_copy-macro.patch - eapply_user + cmake-utils_src_prepare } multilib_src_configure() { diff --git a/sys-libs/libomp/libomp-5.0.0.ebuild b/sys-libs/libomp/libomp-5.0.1.ebuild index fb138e32..b35332a6 100644 --- a/sys-libs/libomp/libomp-5.0.0.ebuild +++ b/sys-libs/libomp/libomp-5.0.1.ebuild @@ -52,15 +52,13 @@ pkg_setup() { src_prepare() { eapply "${FILESDIR}"/${PN}-5.0.0-use-va_copy-macro.patch - eapply_user + cmake-utils_src_prepare } - multilib_src_configure() { local libdir="$(get_libdir)" local mycmakeargs=( -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}" - -DLIBOMPTARGET_LIBDIR_SUFFIX="${libdir#lib}" -DLIBOMP_USE_HWLOC=$(usex hwloc) -DLIBOMP_OMPT_SUPPORT=$(usex ompt) # do not install libgomp.so & libiomp5.so aliases |