commit: c2ff459205b52f2969b55fd6a41a17ad669a7228 Author: stefson <herrtimson <AT> yahoo <DOT> de> AuthorDate: Sat Jun 16 11:18:27 2018 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Sat Jun 16 23:10:57 2018 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=c2ff4592
sys-libs/libomp: sync with tree sys-libs/libomp/Manifest | 2 - .../files/libomp-3.9.0-musl-strerror_r.patch | 35 ---------- .../files/libomp-3.9.0-optional-aliases.patch | 63 ----------------- .../files/libomp-3.9.0-use-va_copy-macro.patch | 12 ---- sys-libs/libomp/libomp-3.9.1.ebuild | 50 -------------- sys-libs/libomp/libomp-5.0.0.ebuild | 78 ---------------------- 6 files changed, 240 deletions(-) diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest index 2698ba1..a4ee5e0 100644 --- a/sys-libs/libomp/Manifest +++ b/sys-libs/libomp/Manifest @@ -1,3 +1 @@ -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.0.src.tar.xz 2074004 BLAKE2B db4a94ab4a40eef794494b9ca00568d8841ccab57d9832227b07014f13494b2dd1fd90c4c4a34aa7516388efb827026f5353ffe67bc55d1a9b80617859fd6822 SHA512 038cc1d262414fac9a05eabdce97b21eb04fc1b3609d07f8da2c9da6b1aaa143f8b26953cb799e7dde82f708103539fe03fe939ba7323a71bd3e9e3925bd5513 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 4fbf9f6..0000000 --- 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 <[email protected]> -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 faf5bb5..0000000 --- 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 <[email protected]> -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/files/libomp-3.9.0-use-va_copy-macro.patch b/sys-libs/libomp/files/libomp-3.9.0-use-va_copy-macro.patch deleted file mode 100644 index ae7cf6a..0000000 --- a/sys-libs/libomp/files/libomp-3.9.0-use-va_copy-macro.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openmp-3.9.0.orig/runtime/src/kmp_str.c openmp-3.9.0/runtime/src/kmp_str.c ---- openmp-3.9.0.orig/runtime/src/kmp_str.c 2016-11-01 12:48:23.089878111 -0700 -+++ openmp-3.9.0/runtime/src/kmp_str.c 2016-11-01 12:49:43.043419074 -0700 -@@ -208,7 +208,7 @@ - - #if ! KMP_OS_WINDOWS - va_list _args; -- __va_copy( _args, args ); // Make copy of args. -+ va_copy( _args, args ); // Make copy of args. - #define args _args // Substitute args with its copy, _args. - #endif // KMP_OS_WINDOWS - rc = KMP_VSNPRINTF( buffer->str + buffer->used, free, format, args ); 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 5c9c096..0000000 --- a/sys-libs/libomp/libomp-3.9.1.ebuild +++ /dev/null @@ -1,50 +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 x86" -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 - "${FILESDIR}"/${PN}-3.9.0-use-va_copy-macro.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 -} diff --git a/sys-libs/libomp/libomp-5.0.0.ebuild b/sys-libs/libomp/libomp-5.0.0.ebuild deleted file mode 100644 index 16ad3a7..0000000 --- a/sys-libs/libomp/libomp-5.0.0.ebuild +++ /dev/null @@ -1,78 +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 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 ~x86" -IUSE="hwloc ompt 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}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - eapply "${FILESDIR}"/${PN}-5.0.0-use-va_copy-macro.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 -}
