From dbbd2ae5e62a232616ede4dae3ed69e15903940a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 24 Jan 2023 18:57:53 +0000
Subject: gentoo auto-resync : 24:01:2023 - 18:57:53

---
 sys-libs/Manifest.gz                      | Bin 14730 -> 14730 bytes
 sys-libs/libomp/Manifest                  |   2 +-
 sys-libs/libomp/libomp-16.0.0.9999.ebuild |  18 +++++++++++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'sys-libs')

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1ff0748fc88f..729d7e89705e 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 262ad73a6985..1828dbbc8263 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -12,6 +12,6 @@ EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 6004ffd9d6b183b99bc9f2117e7db2aef65bce7
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B d92540af690dd622122ad1a4ed2548afa141f1254fbe9a9b3d34286b36f0fa70ccaf915f218c1bea8c68377ea20724db9443d365e2e5f290707f444d3ff47ca5 SHA512 433ae63716103af5aa493c7dbae43f10003cac95abaae579dcb61cba6390da4b9b3fc921e410ba899719bd170fa153a7b3d66c8776c37fd074066173c1fea160
 EBUILD libomp-15.0.6.ebuild 3400 BLAKE2B f3861589a39fa019f47e103225606b5ad3b889222ea0d46f3d955524c5de77d4e0a1c12d3ac426e53ee46824e7de240cad4fc931cf0b239e492417b8159ccabb SHA512 89f27e3bfbcd801eeab05b42d4e20d2adac99b800eeacb1ad27c44505aaed12a1e5a3e17953844f986c084a3928b30083736f3a51689c5c26bbf4ac5a4f21c19
 EBUILD libomp-15.0.7.ebuild 3405 BLAKE2B 888e052d69de713e5ac6b1d56ad91d2b02ec72eed2caff428869ded7751c14104c2b7ffeb5da644daaf59584b13f40e489c17b1b3df49f4742e9fda98e01de8b SHA512 06be30e96d174b56ed7fd36002ca1f562b8e47ab64416c252d7c04781eef4b3495802286f029b972c607f6571db0410993288ad308b74ee727435ac5124bd4b6
-EBUILD libomp-16.0.0.9999.ebuild 3444 BLAKE2B b2bec8619c3cc2c9c6316fba3039b0585b3efcac996e77248b1440f540a2b8115ea0455d1805dfde41ae3e05d975d85ce4d5df4488317727096dfe40e08ea522 SHA512 b81a21676ec9be3cee9a19031cd6d43a6acebb8b637a06c3f7701143b89682f9c8836f0d23d865d2b26a4807cb850abd738a0928b2729fab6a5203ebab1ec7ed
+EBUILD libomp-16.0.0.9999.ebuild 3769 BLAKE2B a5c3ebbfd36869cb4ab676d40f374391e394cee4e2eb2d77c4cdf605ec4b36736621fd7883c3a509922c8140f235ced7b3e6e6267510c771c53271647bd2e5b1 SHA512 c1b55fa30e12c856830fb31e02f31b23c2f64741b8da46a8ac1982718064b6203754919fbfaa99e7850503b325263ec987b87aac0c6955d3b712399548ab13a5
 EBUILD libomp-16.0.0_pre20230107.ebuild 3450 BLAKE2B c698732a256b4236436f8228e334d2f34885fb1093aa5afa8d2e069a1d7dce169756ec29d15b0dabd355bdb1f657af67eef776ec31bb184d9252600eb582a5a7 SHA512 a5117c5017f593e8801f471ad9c359f2cb31b72323195bec42c0759d49fd497dd69f3b1af27db474b63ea07306ac57a68d040cd3c94b9588dc64a1c9134ab964
 MISC metadata.xml 963 BLAKE2B fdea4545db21492049061b85eaa7038965183e10aceae7c41daadc1ce10e7e1bcb2e86344659787ee244360b50b51c99e1a348d3acd2185dac80097541a00dd7 SHA512 c279f8e9c2463dc3f6e02856e520105d6f3321b633439bfe7409bfd6e7e43f1450053dc4f6663492caf7077caf3f4ab0f5cf0161631639e3aefa9ff985dc476f
diff --git a/sys-libs/libomp/libomp-16.0.0.9999.ebuild b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
index b9c22f965396..971931877b19 100644
--- a/sys-libs/libomp/libomp-16.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1
+inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
+inherit python-single-r1 toolchain-funcs
 
 DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
 HOMEPAGE="https://openmp.llvm.org"
@@ -86,6 +87,17 @@ multilib_src_configure() {
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
 	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
 
+	local build_omptarget=OFF
+	# upstream disallows building libomptarget when sizeof(void*) != 8
+	if use offload &&
+		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
+		<<-EOF &>/dev/null
+			int test[sizeof(void *) == 8 ? 1 : -1];
+		EOF
+	then
+		build_omptarget=ON
+	fi
+
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
 		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
@@ -94,7 +106,7 @@ multilib_src_configure() {
 		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
 		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
 
-		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
 
 		# do not install libgomp.so & libiomp5.so aliases
 		-DLIBOMP_INSTALL_ALIASES=OFF
@@ -102,7 +114,7 @@ multilib_src_configure() {
 		-DLIBOMP_COPY_EXPORTS=OFF
 	)
 
-	if use offload; then
+	if [[ ${build_omptarget} == ON ]]; then
 		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
 			mycmakeargs+=(
 				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-- 
cgit v1.2.3