commit: 1caff64b8500b507225cbf44edcc9b2ae7bf4fe1 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Wed Apr 11 20:49:31 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Wed Apr 11 20:59:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1caff64b
sys-libs/libomp: Drop 3.9.1 (old) sys-libs/libomp/Manifest | 1 - .../files/libomp-3.9.0-musl-strerror_r.patch | 35 ------------ .../files/libomp-3.9.0-optional-aliases.patch | 63 ---------------------- sys-libs/libomp/libomp-3.9.1.ebuild | 49 ----------------- 4 files changed, 148 deletions(-) diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index f92ca551513..a956d3da7c5 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,4 +1,3 @@ -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 DIST openmp-6.0.0.src.tar.xz 2272360 BLAKE2B 2fbbdbbd0262ac3161446a4e7a3079131254f962a5397a94913abff024ba3f66affe419c58fb0f6ab602e338a277ab2befbc4386eaf6d4c11aa4a9713315d562 SHA512 9dfb070a3fae883985e3c8cd357c21a2144b433824139e288d4d3c774dd9cf3f7949978976012b08c644cd4a04be8c65a810c2f33d66eee05d3d980e61413a06 diff --git a/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch b/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch deleted file mode 100644 index 4fbf9f691c0..00000000000 --- a/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4fa7d5e207a4f7ef79b423b7d9658b7625795f5c Mon Sep 17 00:00:00 2001 -From: Michal Gorny <mgo...@gentoo.org> -Date: Tue, 18 Oct 2016 16:38:44 +0000 -Subject: [PATCH] Fix a compile error on musl-libc due to strerror_r() - prototype - -Function strerror_r() has different signatures in different -implementations of libc: glibc's version returns a char*, while BSDs -and musl return a int. libomp unconditionally assumes glibc on Linux -and thus fails to compile against musl-libc. This patch addresses this -issue. - -Differential Revision: https://reviews.llvm.org/D25071 - -git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@284492 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - runtime/src/kmp_i18n.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/runtime/src/kmp_i18n.c b/runtime/src/kmp_i18n.c -index 546e693..e008d1f 100644 ---- a/runtime/src/kmp_i18n.c -+++ b/runtime/src/kmp_i18n.c -@@ -809,7 +809,7 @@ sys_error( - int strerror_r( int, char *, size_t ); // XSI version - */ - -- #if KMP_OS_LINUX -+ #if defined(__GLIBC__) && defined(_GNU_SOURCE) - - // GNU version of strerror_r. - --- -2.10.1 - diff --git a/sys-libs/libomp/files/libomp-3.9.0-optional-aliases.patch b/sys-libs/libomp/files/libomp-3.9.0-optional-aliases.patch deleted file mode 100644 index faf5bb51bca..00000000000 --- a/sys-libs/libomp/files/libomp-3.9.0-optional-aliases.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 89ab78e360b7b20ebe1bc89736880a8e4aaa9e6e Mon Sep 17 00:00:00 2001 -From: Michal Gorny <mgo...@gentoo.org> -Date: Wed, 14 Sep 2016 17:46:27 +0000 -Subject: [PATCH] [cmake] Make libgomp & libiomp5 alias install optional - -Introduce a new LIBOMP_INSTALL_VARIABLES cache variable that can be used -to disable creating libgomp and libiomp5 aliases on 'make install'. -Those aliases are undesired e.g. on Gentoo systems where libomp is used -purely by clang. - -Differential Revision: https://reviews.llvm.org/D24563 - -git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@281512 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - runtime/CMakeLists.txt | 4 ++++ - runtime/src/CMakeLists.txt | 16 +++++++++------- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt -index 9db058b..e8e9a74 100644 ---- a/runtime/CMakeLists.txt -+++ b/runtime/CMakeLists.txt -@@ -340,6 +340,10 @@ endif() - - set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX}) - -+# Optional backwards compatibility aliases. -+set(LIBOMP_INSTALL_ALIASES TRUE CACHE BOOL -+ "Install libgomp and libiomp5 library aliases for backwards compatibility") -+ - # Print configuration after all variables are set. - if(${LIBOMP_STANDALONE_BUILD}) - libomp_say("Operating System -- ${CMAKE_SYSTEM_NAME}") -diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt -index 777434d..c80f88d 100644 ---- a/runtime/src/CMakeLists.txt -+++ b/runtime/src/CMakeLists.txt -@@ -305,13 +305,15 @@ else() - - install(TARGETS omp ${LIBOMP_INSTALL_KIND} DESTINATION lib${LIBOMP_LIBDIR_SUFFIX}) - -- # Create aliases (symlinks) of the library for backwards compatibility -- set(LIBOMP_ALIASES "libgomp;libiomp5") -- foreach(alias IN LISTS LIBOMP_ALIASES) -- install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\" -- \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY -- \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})") -- endforeach() -+ if(${LIBOMP_INSTALL_ALIASES}) -+ # Create aliases (symlinks) of the library for backwards compatibility -+ set(LIBOMP_ALIASES "libgomp;libiomp5") -+ foreach(alias IN LISTS LIBOMP_ALIASES) -+ install(CODE "execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"${LIBOMP_LIB_FILE}\" -+ \"${alias}${LIBOMP_LIBRARY_SUFFIX}\" WORKING_DIRECTORY -+ \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})") -+ endforeach() -+ endif() - endif() - install( - FILES --- -2.4.10 - diff --git a/sys-libs/libomp/libomp-3.9.1.ebuild b/sys-libs/libomp/libomp-3.9.1.ebuild deleted file mode 100644 index f52c0d168fd..00000000000 --- a/sys-libs/libomp/libomp-3.9.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} - -inherit cmake-multilib - -MY_P=openmp-${PV} -DESCRIPTION="OpenMP runtime library for LLVM/clang compiler" -HOMEPAGE="https://openmp.llvm.org"; -SRC_URI="https://llvm.org/releases/${PV}/${MY_P}.src.tar.xz"; - -# Additional licenses: -# - MIT-licensed Intel code, -# - LLVM Software Grant from Intel. - -LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant" -SLOT="0/3.9" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="hwloc ompt" - -RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}/${MY_P}.src" - -PATCHES=( - # backport of https://reviews.llvm.org/D24563 - "${FILESDIR}"/${PN}-3.9.0-optional-aliases.patch - # backport of https://reviews.llvm.org/D25071 - "${FILESDIR}"/${PN}-3.9.0-musl-strerror_r.patch -) - -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 - ) - cmake-utils_src_configure -}
