From c915adf64c1415679bfe6b55c95348db2f89202e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Jul 2022 08:41:03 +0100 Subject: gentoo auto-resync : 20:07:2022 - 08:41:03 --- dev-libs/Manifest.gz | Bin 95108 -> 94949 bytes dev-libs/libqtxdg/Manifest | 2 +- dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild | 2 +- dev-libs/libvterm-neovim/Manifest | 3 - .../libvterm-neovim-0.0_pre20150621.ebuild | 30 ----- dev-libs/libvterm-neovim/metadata.xml | 8 -- dev-libs/libzip/Manifest | 2 +- dev-libs/libzip/libzip-1.9.2.ebuild | 2 +- dev-libs/pocl/Manifest | 6 +- dev-libs/pocl/files/pocl-3.0-fix-version.patch | 11 ++ dev-libs/pocl/files/pocl-3.0-icd.patch | 127 ++++++++++++++++++ dev-libs/pocl/metadata.xml | 1 + dev-libs/pocl/pocl-3.0.ebuild | 143 +++++++++++++++++++++ dev-libs/simdjson/Manifest | 3 + dev-libs/simdjson/simdjson-2.2.1.ebuild | 86 +++++++++++++ 15 files changed, 380 insertions(+), 46 deletions(-) delete mode 100644 dev-libs/libvterm-neovim/Manifest delete mode 100644 dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild delete mode 100644 dev-libs/libvterm-neovim/metadata.xml create mode 100644 dev-libs/pocl/files/pocl-3.0-fix-version.patch create mode 100644 dev-libs/pocl/files/pocl-3.0-icd.patch create mode 100644 dev-libs/pocl/pocl-3.0.ebuild create mode 100644 dev-libs/simdjson/simdjson-2.2.1.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index e075f59619ff..481c833617c4 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest index 70c3c4184eed..a4928b73e7b1 100644 --- a/dev-libs/libqtxdg/Manifest +++ b/dev-libs/libqtxdg/Manifest @@ -3,5 +3,5 @@ DIST libqtxdg-3.8.0.tar.xz 76044 BLAKE2B c49f1317c55ea09c4fe9aaea3e96851c4e5dcbc DIST libqtxdg-3.9.1.tar.xz 71604 BLAKE2B 73db84890afa5b7177447a01ae2eb92db4bf13c6e3377a0ac7bdda192b15f8cd068db2875c13ba37d7d27a2c28e48d435801625b11ec8f7eb602fa02b5eca841 SHA512 1b05a10649229a34e3b653c37abefbb02c8b456d77aaabed0e47668818ee29730ea049d96bc5c71c9ad83d1c9c87888195bf228dc9817fd27053f0286752978c EBUILD libqtxdg-3.7.1.ebuild 1118 BLAKE2B c248274bcbcf8b5dcba932fa50c625795aa35f22cc5be314e1ec39f713ad257bf5caa55f04011ef07f7587c9a14fe13c1b2863c85b86448511532757b17094f8 SHA512 6d2722f2bc7a32820106164fdf4cd7dc8ea8734aa54f126b54c459d9299722229246682c1bfa5ae6ed8adbc65e3e408889b948cde153bf1631e0bc94ddb128a2 EBUILD libqtxdg-3.8.0.ebuild 1169 BLAKE2B dff2e3805870839fcc595143e4e63bacbd1696dedbb0d7558ce02733f4628037b623f3c4df013d2e91ef14e585099c43e5eaa9e69ffdb57506b9ebaef3ac09ad SHA512 f5aec3e2c9c36261a2eec1a81b05018f5696b0c81d226dac213103fbb2d34787db99b46d067969ad5703507181955d1ef36dda5ce808e425fe8c504906daddbd -EBUILD libqtxdg-3.9.1.ebuild 1196 BLAKE2B f8710cd39a91f42df36e762b913c08b85cedd919e4bd9f5b2b7856772d1d3d4fe81f85232b190a54b28b8b42e86d20767d4a93d612b5cfb6d3ffd4d1b22e1f27 SHA512 145f4d8ca85bf38438c6e4b04da956746ce6035873a3b9a79dff14f3b2af6f880186e1e415630f9055e633af9411db72b371cc32aa293843d7d89d0e10266c8d +EBUILD libqtxdg-3.9.1.ebuild 1195 BLAKE2B 805acdc37c85c6175d9bf45d1651c7e156819b14edd25dc7921f39320b1f6f0f512a341b9b4f50de554441ced5934b454ade228e898feece7d4d81c5b732a917 SHA512 2c1b68384480a28301035854d643b8c8747df45ad5d542aab094d1e2305c3c1b71501248d0596463e85f9a02318b7594fc71c1441c32d1b1b16c9a4ac9bf3dac MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4 diff --git a/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild index 68967f171547..c1b38373434c 100644 --- a/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild +++ b/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86" fi LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" diff --git a/dev-libs/libvterm-neovim/Manifest b/dev-libs/libvterm-neovim/Manifest deleted file mode 100644 index 4774d79a2883..000000000000 --- a/dev-libs/libvterm-neovim/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST libvterm-neovim-0.0_pre20150621.tar.xz 52240 BLAKE2B 040c2510356a03c4b5b98197a2353285e23025fb8377396fafd4dce3b1afdf0d969e067317f5eb08878fbe69cca601ac85c8dc6cc51416f58e0611100bd54f5d SHA512 e6fe678da5498177d7fbd0cd945600b643f7cd76ff9ed00f3ac7923be55793765429a2f2da5fba4055dfaa4b7200c28a021f3672ce7ae16b99e58738e5093fd8 -EBUILD libvterm-neovim-0.0_pre20150621.ebuild 735 BLAKE2B bf581ece4bcdbf5ddc51267b602c1b08d5af35d9cd2d90c9d63e543ae08cf01fa1802e29cbe8226914302bd4433f6d52bc7e0773e00366fc348c5831c607f1f6 SHA512 ee569a31ca412770df084c109c4694d26841ac26b216dec06249d12a2b82a789ff11d120a32e14d07721816b3c1aeee35c735b6f2fc7b1f16c3acb07758151e3 -MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70 diff --git a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild deleted file mode 100644 index 83c8e6b97293..000000000000 --- a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator" -HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/" -SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="sys-devel/libtool - virtual/pkgconfig" - -src_compile() { - append-cflags -fPIC - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" -} - -src_install() { - emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" install - find "${ED}" -name '*.la' -o -name "*.a" -delete || die - - dodoc -r doc/. -} diff --git a/dev-libs/libvterm-neovim/metadata.xml b/dev-libs/libvterm-neovim/metadata.xml deleted file mode 100644 index 2e4c5182444f..000000000000 --- a/dev-libs/libvterm-neovim/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - vim@gentoo.org - Gentoo Vim Project - - diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index ba2804abb367..173de5a0f470 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,5 +1,5 @@ DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5 EBUILD libzip-1.8.0-r1.ebuild 2444 BLAKE2B adc40f870375d1c3bd5753018108985f34b4e2eebd20b8205c6368086bc9dd0a289b7f3c6484969740712b9ef315d18abb0fbe628256b72ffb8c6f3c789abc1c SHA512 467c9a3a7f17c018384b10e679364ecaf9c41762f155d1da0c3438a2cdcd210426726ea7662a532f44c058bb0958a9b0371c1b6ac776b205949448f9ca3fe4c2 -EBUILD libzip-1.9.2.ebuild 2452 BLAKE2B 0e9a40f854339b7a206ebbea483835524f59b2a37d829f17195fba8e2238ee39035ec24fb4b1eb928f905f58ef45e873b8c36f76296e7aa7736fd5ad0379f281 SHA512 97123443fc12a1b521202b907b7cf877913b81dc3cbe49a960a975b966391e82ef0a149df58320af269692e3caa09033acc4a06c84a85d4ca4789f0794213848 +EBUILD libzip-1.9.2.ebuild 2449 BLAKE2B 5c5225e6bf3d6f311c32ad1c99a7a3b70301980153b63651051c1f0384697efff69bbe9a340f38ecdc1808c8cd5897646e2f8c688a8460f0f9d70e76c1c303a2 SHA512 f37a2811a12704b834523e5eead46b0c405707ae45143ae156f26e566aa910f490a9545be68284141c92d144c2e670d3f5a8f7e9b804a524f402619553e7b901 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337 diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild index 0a706c57e930..20517344615c 100644 --- a/dev-libs/libzip/libzip-1.9.2.ebuild +++ b/dev-libs/libzip/libzip-1.9.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz" LICENSE="BSD" SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd" REQUIRED_USE="test? ( tools )" diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest index 862179626371..4eeb32150ed9 100644 --- a/dev-libs/pocl/Manifest +++ b/dev-libs/pocl/Manifest @@ -1,4 +1,8 @@ +AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4 +AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7 AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72f5dc1b544c7f83417dbb5e3d100dad07bdf3365a48ee92e856de4edc4b7c25674b45efd6d0ace1ac559273641ca175a269 SHA512 2ae144e7590049cc1eac8fa30e360cd511331abba0dfe683867d6a089742ea12cc3bc48dafe41a1c1c9b891fdf35aaac8b14cc1e10a78d2ab49b5e14635bb258 DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d +DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea EBUILD pocl-1.8-r2.ebuild 3121 BLAKE2B 23434ed062197c4e656febf58cb286deb8e14b3f98eb99c4b624d09545117203171378b954fa25557313b1fc22288aa4fde435b3d4e900aad83e499b2bf27469 SHA512 68a4ae0feb2e6e3e87b25ce8ef7064ec428bb1fd4fbffd2dc6b78dd79e6146b31b617c6ff1fa2e9236e6c38ce5c472a585d2178be30202efe348c9ba2a2f70f0 -MISC metadata.xml 1199 BLAKE2B 90d31048bcc33a76837977547ba818b2d2a268c408e7ad40eb157864d7c561d0bbc8ad40a013e28c74092f27f7fc3d23ae52322a2ca2d681c109ace154e29214 SHA512 98341aa0795cf9439ed4c0b8e2575657eaa5898e21b64d7d73592badac0b2a82fe061005a6adcf4e9d3318a4f20b80c62bd379f587dd4fcf993a95017f8ce867 +EBUILD pocl-3.0.ebuild 3656 BLAKE2B 17cb07719ab059d2d0d7081453e751a754e1b962d3105876c5b474b79887a000f03934d93317c5dc2641ba8bae82bb333ea2d7b142c0402b27264bf8efd952ed SHA512 8e980fcba437b88a665e89662394a2fc2fcd512af4e1e544aa7e38f4664cc327ae45d053b1e1b26fe206486656787cb5decc360d07f0c70ce8aa3878aaa3c67e +MISC metadata.xml 1265 BLAKE2B 857cd7ad6dae95355a8102678be5ac4628eecc4b3135ed910b06e9bb5cb5df4473ba6228cd54908717ec87386e7ae41322e8546403648f5d90cd1db57eec8861 SHA512 800fdb1d3c430cd4c4cf3a9792297708cf7779863da2e477327d0bc21c2f4ed83b599f1b703efa31b144140cd2c657a18fc76ce0a7dc5db51e7e27f202ac0e0b diff --git a/dev-libs/pocl/files/pocl-3.0-fix-version.patch b/dev-libs/pocl/files/pocl-3.0-fix-version.patch new file mode 100644 index 000000000000..8ae428036340 --- /dev/null +++ b/dev-libs/pocl/files/pocl-3.0-fix-version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,7 @@ endif() + + set(MAJOR_VERSION 3) + set(MINOR_VERSION 0) +-set(VERSION_SUFFIX_FIXED_TEXT "-rc2") ++set(VERSION_SUFFIX_FIXED_TEXT "") + set(VERSION_SUFFIX "${VERSION_SUFFIX_FIXED_TEXT}") + set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX}) + set(POCL_VERSION_BASE ${VERSION_STRING}) diff --git a/dev-libs/pocl/files/pocl-3.0-icd.patch b/dev-libs/pocl/files/pocl-3.0-icd.patch new file mode 100644 index 000000000000..f64e633e2f53 --- /dev/null +++ b/dev-libs/pocl/files/pocl-3.0-icd.patch @@ -0,0 +1,127 @@ +From 408fe60850977ab9c68d174a42ae4a5f3455cab1 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Wed, 20 Jul 2022 04:59:11 +0000 +Subject: [PATCH] CMake: fix build without ocl-icd + +If not using ocl-icd (in this case, I was using dev-libs/opencl-icd-loader), +OCL_ICD_INCLUDE_DIRS and friends won't be defined and CMake bails out +with an error: +``` +-- Configuring done +CMake Error: The following variables are used in this project, but they are set to NOTFOUND. +Please set them or make sure they are set and tested correctly in the CMake files: +/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/OCL_ICD_INCLUDE_DIRS + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL +/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/OCL_ICD_INCLUDE_DIRS + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices +/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic/OCL_ICD_INCLUDE_DIRS + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic +/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread/OCL_ICD_INCLUDE_DIRS + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread +/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology/OCL_ICD_INCLUDE_DIRS + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology +/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl/OCL_ICD_INCLUDE_DIRS + used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl +``` + +This broke in 3ecda3b294d70e4f915ad141d669f4bc1298f606. + +To fix, just check if the value is truthy before using (this is enough +for checking if it's NOTFOUND). +--- a/lib/CL/CMakeLists.txt ++++ b/lib/CL/CMakeLists.txt +@@ -179,7 +179,9 @@ endif() + add_library("pocl_cache" OBJECT "pocl_cache.c") + harden("pocl_cache") + +-target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++endif() + + + if (ENABLE_LLVM) +@@ -190,7 +192,9 @@ if (ENABLE_LLVM) + add_library("lib_cl_llvm" OBJECT ${LLVM_API_SOURCES}) + harden("lib_cl_llvm") + +- target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++ if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++ endif() + + list(APPEND LIBPOCL_OBJS "$") + list(APPEND LIBPOCL_OBJS "$") +@@ -200,7 +204,9 @@ if (ENABLE_LLVM) + endif() + + if(ENABLE_ICD) +- add_compile_options(${OCL_ICD_CFLAGS}) ++ if(${OCL_ICD_CFLAGS}) ++ add_compile_options(${OCL_ICD_CFLAGS}) ++ endif() + endif() + + if(HAVE_LTTNG_UST) +--- a/lib/CL/devices/CMakeLists.txt ++++ b/lib/CL/devices/CMakeLists.txt +@@ -28,7 +28,9 @@ if(ENABLE_LOADABLE_DRIVERS) + function(add_pocl_device_library name) + add_library(${name} SHARED ${ARGN}) + harden("${name}") +- target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++ if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++ endif() + target_link_libraries(${name} PUBLIC ${POCL_PUBLIC_LINK_LIST} PRIVATE ${POCL_LIBRARY_NAME} ${POCL_PRIVATE_LINK_LIST}) + set_target_properties(${name} PROPERTIES PREFIX "lib" SUFFIX ".so") + install(TARGETS ${name} LIBRARY DESTINATION "${POCL_INSTALL_PRIVATE_LIBDIR}" COMPONENT "lib") +@@ -38,7 +40,9 @@ else() + + function(add_pocl_device_library name) + add_library(${name} OBJECT ${ARGN}) +- target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++ if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++ endif() + endfunction() + + endif() +@@ -143,7 +147,9 @@ if(MSVC) + set_source_files_properties( ${POCL_DEVICES_SOURCES} PROPERTIES LANGUAGE CXX ) + endif(MSVC) + add_library("pocl-devices" OBJECT ${POCL_DEVICES_SOURCES}) +-target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++endif() + set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}" + "$") + harden("pocl-devices") +--- a/lib/CL/devices/topology/CMakeLists.txt ++++ b/lib/CL/devices/topology/CMakeLists.txt +@@ -30,7 +30,9 @@ endif(MSVC) + add_library("pocl-devices-topology" OBJECT pocl_topology.c pocl_topology.h) + harden("pocl-devices-topology") + +-target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++endif() + + if(Hwloc_FOUND) + target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${Hwloc_INCLUDE_DIRS}) +--- a/lib/llvmopencl/CMakeLists.txt ++++ b/lib/llvmopencl/CMakeLists.txt +@@ -101,7 +101,9 @@ endif(MSVC) + add_library("llvmpasses" OBJECT ${LLVMPASSES_SOURCES}) + harden("llvmpasses") + +-target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++if(${OCL_ICD_INCLUDE_DIRS}) ++ target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS}) ++endif() + + option(ENABLE_LIBLLVMOPENCL "Build separate libllvmopencl.so for use with 'opt'" OFF) + if(ENABLE_LIBLLVMOPENCL) diff --git a/dev-libs/pocl/metadata.xml b/dev-libs/pocl/metadata.xml index 1e1a7087abb5..9e73154528e9 100644 --- a/dev-libs/pocl/metadata.xml +++ b/dev-libs/pocl/metadata.xml @@ -14,6 +14,7 @@ Enable hwloc support Enables custom memory manager. Except for special circumstances, this should be disabled + Adds support for link time optimization pocl/pocl diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild new file mode 100644 index 000000000000..629cf11a51ed --- /dev/null +++ b/dev-libs/pocl/pocl-3.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_AUTODOC=0 +DOCS_BUILDER="sphinx" +DOCS_DIR="doc/sphinx/source" +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +LLVM_MAX_SLOT=14 + +inherit cmake llvm python-any-r1 docs + +DESCRIPTION="Portable Computing Language (an implementation of OpenCL)" +HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl" +SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +# TODO: hsa tce +IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test" +# Tests not yet passing, fragile in Portage environment(?) +RESTRICT="!test? ( test ) test" + +# TODO: add dependencies for cuda +# Note: No := on LLVM because it pulls in Clang +# see llvm.eclass for why +CLANG_DEPS="!cuda? (