commit: 17219f692c0d17c1d91d454c0b2fa32bcad3f40e Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Mar 10 18:20:43 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Mar 10 19:52:55 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17219f69
sys-libs/libomp: Drop <6 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-libs/libomp/Manifest | 2 - ...-link-latomic-to-provide-atomics-when-ava.patch | 94 --------------------- sys-libs/libomp/libomp-4.0.1.ebuild | 97 ---------------------- sys-libs/libomp/libomp-5.0.2.ebuild | 90 -------------------- 4 files changed, 283 deletions(-) diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index f9c3bf2b601..73eed77869d 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,5 +1,3 @@ -DIST openmp-4.0.1.src.tar.xz 2275240 BLAKE2B e63cf670c4cd2678afc4d7b96be85c3d157bf91a69510f980d9a0a07f61b449b22ff28d63753f32e63afedb4a7077c662a633f689a660b5047a83bcf1fb7f009 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf -DIST openmp-5.0.2.src.tar.xz 2081560 BLAKE2B fbe41c6aaf4c8e961253609a598bec531ab4685cd8c307ab2528b9d7553eaa38122ee02a2c4d481454f9233c062b3a24bb174a182702a183907a3d15a10a9655 SHA512 511895ca6049c17de81ad86c39dcb940a7c1a793005e16d33e58d72ad47f62b8cb61003c234a7544a88e79f25d2c86e9df834f90d37ccbd4b47f71c369e90437 DIST openmp-6.0.1.src.tar.xz 2048320 BLAKE2B 08b3a7051c985903f78331f55a1c6e928399b87c862c43c991e9bf78b66b6e412fc96f202b82c051176dbbe02422f8ceb7414f44ea8f3522f418e515c0f70c62 SHA512 abb956583e5d11d0c6f6d97183c081d658616a74933be884a591eaa3d8c4bb04f08f02016d2c86d7384c7ff1aa44fb949b0d967fc0ff50e3132aaba412e9add8 DIST openmp-7.0.1.src.tar.xz 909316 BLAKE2B b8adbf67738b8d2d2d42b45b24aabd2f5e65a7b9cdda0d4a62511808c2101d9bb925b4904a9ecb98f77a1b7f38f13408fea6f724748183f9d5f5419c3fdeac54 SHA512 2062db8b87bce2c130bab528a6d654cb05b3de7641737552fc263724ceaa5e322afc2787796a0bddcda8d1bdf913a49f5a0180abcc57f8842b7e8ea8df4d6f51 DIST openmp-8.0.0rc2.src.tar.xz 934468 BLAKE2B e3496bc58a86282ac75417b98675f490c7a4c94038d5e79ef48b14ad4adcfcadc883caade3f9b8f6d189250cfb770a63984baca982e1295058f200494aaaf0f7 SHA512 56c73affd5533c40123464218d225a25f47fdf93fe3e1288f6c4ff6743ee745929ecc881334ded2aae193786366397a9add60aa6b3675631548980f80d9ac6c9 diff --git a/sys-libs/libomp/files/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch b/sys-libs/libomp/files/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch deleted file mode 100644 index 68817558326..00000000000 --- a/sys-libs/libomp/files/4.0.1/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 <mgo...@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-4.0.1.ebuild b/sys-libs/libomp/libomp-4.0.1.ebuild deleted file mode 100644 index 7b78f15ca8d..00000000000 --- a/sys-libs/libomp/libomp-4.0.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-multilib linux-info python-any-r1 - -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="https://openmp.llvm.org"; -SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"; - -# Additional licenses: -# - MIT-licensed Intel code, -# - LLVM Software Grant from Intel. - -LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="hwloc kernel_linux ompt test" -RESTRICT="!test? ( test )" - -RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )" -# tests: -# - dev-python/lit provides the test runner -# - sys-devel/llvm provide test utils (e.g. FileCheck) -# - sys-devel/clang provides the compiler to run tests -DEPEND="${RDEPEND} - dev-lang/perl - test? ( - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') - sys-devel/llvm - >=sys-devel/clang-3.9.0 - )" - -S=${WORKDIR}/openmp-${PV/_/}.src - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -kernel_pds_check() { - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then - local CONFIG_CHECK="~!SCHED_PDS" - local ERROR_SCHED_PDS="\ -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible -performance problems with libomp. If you are using one of the specified -kernel versions, you may want to disable the PDS scheduler." - - check_extra_config - fi -} - -pkg_pretend() { - kernel_pds_check -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # fix atomic tests with gcc - eapply "${FILESDIR}"/4.0.1/0001-test-Try-to-link-latomic-to-provide-atomics-when-ava.patch - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}" - -DLIBOMP_USE_HWLOC=$(usex hwloc) - -DLIBOMP_OMPT_SUPPORT=$(usex ompt) - # do not install libgomp.so & libiomp5.so aliases - -DLIBOMP_INSTALL_ALIASES=OFF - # disable unnecessary hack copying stuff back to srcdir - -DLIBOMP_COPY_EXPORTS=OFF - -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")" - ) - cmake-utils_src_configure -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake-utils_src_make check-libomp -} diff --git a/sys-libs/libomp/libomp-5.0.2.ebuild b/sys-libs/libomp/libomp-5.0.2.ebuild deleted file mode 100644 index 38e97e4bf43..00000000000 --- a/sys-libs/libomp/libomp-5.0.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-multilib linux-info python-any-r1 - -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="https://openmp.llvm.org"; -SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz"; - -# Additional licenses: -# - MIT-licensed Intel code, -# - LLVM Software Grant from Intel. - -LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" -IUSE="hwloc kernel_linux ompt test" -RESTRICT="!test? ( test )" - -RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )" -# tests: -# - dev-python/lit provides the test runner -# - sys-devel/llvm provide test utils (e.g. FileCheck) -# - sys-devel/clang provides the compiler to run tests -DEPEND="${RDEPEND} - dev-lang/perl - test? ( - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') - sys-devel/llvm - >=sys-devel/clang-3.9.0 - )" - -S=${WORKDIR}/openmp-${PV/_/}.src - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - -python_check_deps() { - has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -kernel_pds_check() { - if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then - local CONFIG_CHECK="~!SCHED_PDS" - local ERROR_SCHED_PDS="\ -PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11 -< 4.14-pf9) do not implement sched_yield() call which may result in horrible -performance problems with libomp. If you are using one of the specified -kernel versions, you may want to disable the PDS scheduler." - - check_extra_config - fi -} - -pkg_pretend() { - kernel_pds_check -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local libdir="$(get_libdir)" - local mycmakeargs=( - -DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}" - -DLIBOMP_USE_HWLOC=$(usex hwloc) - -DLIBOMP_OMPT_SUPPORT=$(usex ompt) - # do not install libgomp.so & libiomp5.so aliases - -DLIBOMP_INSTALL_ALIASES=OFF - # disable unnecessary hack copying stuff back to srcdir - -DLIBOMP_COPY_EXPORTS=OFF - -DLIBOMP_TEST_COMPILER="$(type -P "${CHOST}-clang")" - ) - cmake-utils_src_configure -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - - cmake-utils_src_make check-libomp -}
