sys-libs/libomp - forward port patch for va_copy

3 files changed, 109 insertions, 0 deletions

diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 24e5690e..ee8e12e3 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -4,8 +4,11 @@ AUX libomp-3.9.0-musl-strerror_r.patch 1159 SHA256 b1aa6d44d4d613cb1383975831ad4
 AUX libomp-3.9.0-optional-aliases.patch 2536 SHA256 31c143bdb761a969888348ced721f22be7af7413da0b5238642a75efd8c2fcd7 SHA512 0cf501decca0997ee84754bc6c5b3401dbf408571dc169bbfd3fe892f6d0c730785a1bb4293e55eb47f8e808707810e22fac15702853a06cd7531d7a37c54265 WHIRLPOOL fa722bd91c74307217d7c419a27d6d6a55730bcd144a5e2630c0ab48a974b9ce4686e1a2dc82da735dec525f8ad5c96885a5c27b900cc5ce0057a32c146ef414
 AUX libomp-3.9.0-use-va_copy-macro.patch 665 SHA256 1f6df759676fb048c9e46da328f0068dd6ad448fbbb22ecf0f5a9a8873a411ed SHA512 b02c23725a9f45320f2978f180cb815b92a0b64be4fc3b5ea019fae76c789d572f01cc79399383504b6c4fed3d2b8be059311013b23e26dc63640fa8e3408430 WHIRLPOOL 45b13ca42cf92d1b5ae38e2846247817e8751eaa1fe093c50f4c8b9477c3a57bb51ef6ea1e8869c2f56b836ffd6274c75b10f1dada91a6548d93de05ad1c5458
 AUX libomp-4.0.0-use-va_copy-macro.patch 689 SHA256 ab1d7bbb5d2cac529b43eea8e068625b169d7aa1f00c072169fc4c29cbdbe8c2 SHA512 ff1f2983c9ff0a8d8bccb937f8489d368a7de2cd5937b99f9a0c1b8f13331e93b910839ff42bf0384ad43b2c5322f6f9401243ef8828ab483fd429442bf7f149 WHIRLPOOL af1232aa25622e0c36a9f8eae53484a69e88995d079a6139701fc0b34f3debe7f555668cd88d936473009887a46b666f8a73b6369ec1bbad075ecdadb3af4495
+AUX libomp-5.0.0-use-va_copy-macro.patch 886 SHA256 b73daeb944481af9c74895c4e46963980fa97876dca702456abcbf4637d58b57 SHA512 520784907deb43de3bf62c8ce5e2c2460c59ae69094ae20666cbde7c4adb424ce36a1274745759387e465b6a65373801b972ea70e11cd5bdb63a6da5505abba0 WHIRLPOOL 092bb211537238547063ada3c940d4db86828bcb51712193dfd32555a4220ff2713f016a6e718c0a2ed5142365954fcb56b1bb094487cc1b601878ded20148a1
 DIST openmp-3.9.1.src.tar.xz 2031588 SHA256 d23b324e422c0d5f3d64bae5f550ff1132c37a070e43c7ca93991676c86c7766 SHA512 80924a6f9765f634d24d7b0aa036d92c912dbd8e067487a14bdd03b4c587fdfc92e83eb29926bfa637ef45be3f133a924f77ab12099ea3706c18e9c42774708b WHIRLPOOL b6ec75d4f9d2b86bb8e2927791cb46e61ff8657fc21f9e0ba9893d81d3382522aca330564f3156c1fbbf765de0499e875e41e11199abe2da8ed1bef057d5e8d8
 DIST openmp-4.0.1.src.tar.xz 2275240 SHA256 ec693b170e0600daa7b372240a06e66341ace790d89eaf4a843e8d56d5f4ada4 SHA512 0b737dde832c5907a0cac41fe1d594b61e85dd405eee42b39f09233db62b44543204ccc775e52e2981f9c9f0683b234526e288a3a7a04f712280fb3a575abcaf WHIRLPOOL 102f4b6984e6bc4dc08349e7f1f0ff31646bad923018cfd342e0bee760d8b1036f0c54c565af3b0730c470d584e37ed905bcbfa1ffc2325dafa0a02d91088b05
+DIST openmp-5.0.0.src.tar.xz 2074004 SHA256 c0ef081b05e0725a04e8711d9ecea2e90d6c3fbb1622845336d3d095d0a3f7c5 SHA512 038cc1d262414fac9a05eabdce97b21eb04fc1b3609d07f8da2c9da6b1aaa143f8b26953cb799e7dde82f708103539fe03fe939ba7323a71bd3e9e3925bd5513 WHIRLPOOL e32436cc925173db2f58dc0b454ed046c733877edce3383da0a621ea90e9c30d9e45c0063451feb9b0dc95102893db02832d97bfb3a200e3440e4cad7fb9720a
 EBUILD libomp-3.9.1.ebuild 1375 SHA256 57c543884575e8370de4257784a419222a99cc93f03deab86ef513c5cb21c7d3 SHA512 d95aa3e0da00843d61c2edb8d840cba377421a768cddffb760f3d2acb1be14892d8fd72e938e1af3cef6b83cc9b445825662ddf92e1705701cd7028a22265ab7 WHIRLPOOL aabd36b3e9c03aa9297e5a019b51586d59622e6cb1e5c4137bc122084cabe226c3464d06c5fbe57844be680905143626f9cf83e971948f489cc9db7d809b2ae7
 EBUILD libomp-4.0.1.ebuild 2017 SHA256 93866a9796b3ed11541a9d7d2718ad46229545e5a16364fc09e2d3a20d6e47a4 SHA512 4239ea63d879e29c7741e28bf5b905767f1d6e29b2c58075e6da6227c8e4a2d8bb240f979dd2269ee12950855a50c7dacc896e4c70660551722a1e4e6c1bd207 WHIRLPOOL 391b6e2842bdecf6d19327b5521d0c285d6dbc32e0e9f8789e72b3093d688b7cc3137036a453464a50a8fa0dff2e5684d0ae4f384c5e64032f91ddb2dfcb9ae5
+EBUILD libomp-5.0.0.ebuild 1946 SHA256 2cf4e057630bb242396c505dbac2167d8e84c1bc432f10c55f66d23f347502fa SHA512 f0518408922066e1cff5cdf35c36637d72ee6b4dacf098096d1a67d5a98979d085c93de76ab27a4440118ce96c3d422a654d1a40600aecc28adb2b4386b9d96e WHIRLPOOL 8f6245c723b2dbf52b011b8e20981f8e907e77cad21e40720e2981319322975c0e84f9f984b5848580734123828f2f0275b0c93b2af343eeb49af7e0195eef95
 MISC metadata.xml 670 SHA256 c32e97e9d85d756302a38aac03d55a14d3e5b43cc910f1dff35b9f0c8bea03b1 SHA512 d4269bb7192e00feed26327bb2ac36db3b1c4f5d55417c22efb9a64fa5a006c17dd39459ecc305e8a9a3a954271ad10013fe5c9159a30ea609513aabddebf485 WHIRLPOOL d0022a64d2cad055eab1c6921cdfd4372fcf9cabd40c5ba7bf74d49eaff5f3498545fe29bbfc20bbee2cc3fed596e6a4d9f408d912f39900bbfb1c6c4aabb61a
diff --git a/sys-libs/libomp/files/libomp-5.0.0-use-va_copy-macro.patch b/sys-libs/libomp/files/libomp-5.0.0-use-va_copy-macro.patch
new file mode 100644
index 00000000..6f1a1989
--- /dev/null
+++ b/sys-libs/libomp/files/libomp-5.0.0-use-va_copy-macro.patch
@@ -0,0 +1,26 @@
+From cb8e8ab68bd2af477dc73c5ad5d0bc10bacab8f7 Mon Sep 17 00:00:00 2001
+From: "Jory A. Pratt" <anarchy@gentoo.org>
+Date: Sat, 9 Sep 2017 08:20:40 -0500
+Subject: [PATCH] Use va_cpoy macro
+
+Signed-off-by: Jory A. Pratt <anarchy@gentoo.org>
+---
+ runtime/src/kmp_str.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/src/kmp_str.cpp b/runtime/src/kmp_str.cpp
+index 88967e1..75d33df 100644
+--- a/runtime/src/kmp_str.cpp
++++ b/runtime/src/kmp_str.cpp
+@@ -168,7 +168,7 @@ void __kmp_str_buf_vprint(kmp_str_buf_t *buffer, char const *format,
+ 
+ #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);
+-- 
+2.14.1
+
diff --git a/sys-libs/libomp/libomp-5.0.0.ebuild b/sys-libs/libomp/libomp-5.0.0.ebuild
new file mode 100644
index 00000000..fb138e32
--- /dev/null
+++ b/sys-libs/libomp/libomp-5.0.0.ebuild
@@ -0,0 +1,80 @@
+# 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 ~arm64 ~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
+
+	eapply_user
+}
+
+
+multilib_src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIBOMP_LIBDIR_SUFFIX="${libdir#lib}"
+		-DLIBOMPTARGET_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
+}