* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/, sys-libs/libomp/files/
@ 2016-10-18 16:59 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2016-10-18 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 2b24f61af9fea06bfbc34d4f8e381d00b38853cd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 16:57:25 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 16:59:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b24f61a
sys-libs/libomp: Backport upstream musl fix by Lei Zhang
Closes: https://github.com/gentoo/gentoo/pull/2118
.../files/libomp-3.9.0-musl-strerror_r.patch | 35 ++++++++++++++++++++++
sys-libs/libomp/libomp-3.9.0.ebuild | 2 ++
2 files changed, 37 insertions(+)
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
new file mode 100644
index 00000000..4fbf9f6
--- /dev/null
+++ b/sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch
@@ -0,0 +1,35 @@
+From 4fa7d5e207a4f7ef79b423b7d9658b7625795f5c Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@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/libomp-3.9.0.ebuild b/sys-libs/libomp/libomp-3.9.0.ebuild
index ed972e8..dad6963 100644
--- a/sys-libs/libomp/libomp-3.9.0.ebuild
+++ b/sys-libs/libomp/libomp-3.9.0.ebuild
@@ -27,6 +27,8 @@ 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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/, sys-libs/libomp/files/
@ 2018-04-04 12:01 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2018-04-04 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 08c4c6ba3eab495f9fd3d1f082146b0c6de4ceaa
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 4 11:48:32 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 4 12:01:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c4c6ba
sys-libs/libomp: Drop old 3.8.1
sys-libs/libomp/Manifest | 1 -
.../files/libomp-3.7.0-no_compat_symlinks.patch | 17 -------
.../libomp/files/libomp-3.7.0-os_detection.patch | 19 --------
sys-libs/libomp/libomp-3.8.1.ebuild | 57 ----------------------
4 files changed, 94 deletions(-)
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 55dc0015eed..fd7e2ac53be 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -1,4 +1,3 @@
-DIST openmp-3.8.1.src.tar.xz 2009572 BLAKE2B afb548cf08c741d98a966385ee4693089b6e247f53777461b5f4c5238bb021d699335551ad610040ec50b70c55641247cae767152f9b9f29e6a11fbf3e21b067 SHA512 406e9077817c50bcd58dd50bd334258ebf4b81c3ecce830ae1f427bd7c1fc9376b63fdeb3459c953c341becde82d83be18069bfcd34cbaeee6f1478267c0b2bc
DIST openmp-3.9.0.src.tar.xz 2257596 BLAKE2B fae0e3e36afcd1a223030f09209865ce706b31c8a07f4d1e457d1a78f086a022260740da908f9e03e007bd63f2d9901d1c819393b2f46af06e4c7c162c8a89ba SHA512 030432bb10d86016f0f1c4f4d8b25f78acdb4aed33c604baf07c825bbcc6198306f2f71a3e56030f20864a92ab0187357aff94d34e47f7166991faf539c0104d
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
diff --git a/sys-libs/libomp/files/libomp-3.7.0-no_compat_symlinks.patch b/sys-libs/libomp/files/libomp-3.7.0-no_compat_symlinks.patch
deleted file mode 100644
index c8b56e2bc89..00000000000
--- a/sys-libs/libomp/files/libomp-3.7.0-no_compat_symlinks.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur openmp-3.7.0.src.orig/runtime/src/CMakeLists.txt openmp-3.7.0.src/runtime/src/CMakeLists.txt
---- openmp-3.7.0.src.orig/runtime/src/CMakeLists.txt 2015-07-15 23:41:36.000000000 +0200
-+++ openmp-3.7.0.src/runtime/src/CMakeLists.txt 2015-09-05 23:41:17.105242541 +0200
-@@ -288,13 +288,6 @@
- endforeach()
- else()
- install(TARGETS omp LIBRARY 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}${CMAKE_SHARED_LIBRARY_SUFFIX}\" WORKING_DIRECTORY
-- \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib${LIBOMP_LIBDIR_SUFFIX})")
-- endforeach()
- endif()
- install(
- FILES
diff --git a/sys-libs/libomp/files/libomp-3.7.0-os_detection.patch b/sys-libs/libomp/files/libomp-3.7.0-os_detection.patch
deleted file mode 100644
index a0b2aad375f..00000000000
--- a/sys-libs/libomp/files/libomp-3.7.0-os_detection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur openmp-3.7.0.src.orig/runtime/tools/lib/Uname.pm openmp-3.7.0.src/runtime/tools/lib/Uname.pm
---- openmp-3.7.0.src.orig/runtime/tools/lib/Uname.pm 2015-01-19 19:29:35.000000000 +0100
-+++ openmp-3.7.0.src/runtime/tools/lib/Uname.pm 2015-09-04 19:30:25.821746740 +0200
-@@ -236,15 +236,6 @@
- $bulk =~ m{^DISTRIB_ID\s*=\s*(.*?)\s*$}m
- or runtime_error( "$release: There is no DISTRIB_ID:", $bulk, "(eof)" );
- $values{ operating_system_name } = $1;
-- $bulk =~ m{^DISTRIB_RELEASE\s*=\s*(.*?)\s*$}m
-- or runtime_error( "$release: There is no DISTRIB_RELEASE:", $bulk, "(eof)" );
-- $values{ operating_system_release } = $1;
-- $bulk =~ m{^DISTRIB_CODENAME\s*=\s*(.*?)\s*$}m
-- or runtime_error( "$release: There is no DISTRIB_CODENAME:", $bulk, "(eof)" );
-- $values{ operating_system_codename } = $1;
-- $bulk =~ m{^DISTRIB_DESCRIPTION\s*="?\s*(.*?)"?\s*$}m
-- or runtime_error( "$release: There is no DISTRIB_DESCRIPTION:", $bulk, "(eof)" );
-- $values{ operating_system_description } = $1;
- } else {
- # Oops. lsb-release is missed or not informative. Try other *-release files.
- $release = "/etc/system-release";
diff --git a/sys-libs/libomp/libomp-3.8.1.ebuild b/sys-libs/libomp/libomp-3.8.1.ebuild
deleted file mode 100644
index 3db23e409e1..00000000000
--- a/sys-libs/libomp/libomp-3.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-
-inherit cmake-utils multilib-minimal
-
-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.8"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}.src"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.7.0-os_detection.patch
- "${FILESDIR}"/${PN}-3.7.0-no_compat_symlinks.patch
- )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++11; then
- eerror "${P} requires C++11-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
- eerror "to gcc-4.7 or an equivalent version supporting C++11."
- die "Currently active compiler does not support -std=c++11"
- fi
- fi
-}
-
-multilib_src_configure() {
- local libdir="$(get_libdir)"
- local mycmakeargs=( "-DLIBOMP_LIBDIR_SUFFIX=${libdir#lib}" )
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-04 12:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-18 16:59 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/, sys-libs/libomp/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-04-04 12:01 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox