From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0DC00139044 for ; Tue, 18 Oct 2016 16:59:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E4DBE0B0B; Tue, 18 Oct 2016 16:59:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3651BE0B0B for ; Tue, 18 Oct 2016 16:59:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3704D341649 for ; Tue, 18 Oct 2016 16:59:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34B692EA for ; Tue, 18 Oct 2016 16:59:40 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1476809978.2b24f61af9fea06bfbc34d4f8e381d00b38853cd.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/, sys-libs/libomp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/libomp/files/libomp-3.9.0-musl-strerror_r.patch sys-libs/libomp/libomp-3.9.0.ebuild X-VCS-Directories: sys-libs/libomp/files/ sys-libs/libomp/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2b24f61af9fea06bfbc34d4f8e381d00b38853cd X-VCS-Branch: master Date: Tue, 18 Oct 2016 16:59:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d24dc53f-9aa4-41ec-b355-71b91df7d7c4 X-Archives-Hash: 8a92f772db90c210e9a85b617b506598 commit: 2b24f61af9fea06bfbc34d4f8e381d00b38853cd Author: Michał Górny gentoo org> AuthorDate: Tue Oct 18 16:57:25 2016 +0000 Commit: Michał Górny gentoo 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 +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() {