diff options
Diffstat (limited to 'dev-libs')
47 files changed, 413 insertions, 1864 deletions
diff --git a/dev-libs/asmjit/Manifest b/dev-libs/asmjit/Manifest deleted file mode 100644 index 8733ba51c..000000000 --- a/dev-libs/asmjit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST asmjit-1.0_p22092020.tar.gz 601680 BLAKE2B dcbfc7f5385bc12d70e4c0418c89fed4453e3b08e88ccae78775d5b65d0eaada1fc12809732a77fde8b50966aacfa487e213e96754e2b7846836dcd5057a1c0b SHA512 fae457eef331edb8b9ecec23630d109500751e9ff0a7c8081c962d76c67ce68ea5813189185537f916946ce2c9c84c1574799315952f776b703019783632c4cf diff --git a/dev-libs/asmjit/asmjit-1.0_p22092020.ebuild b/dev-libs/asmjit/asmjit-1.0_p22092020.ebuild deleted file mode 100644 index 097ccfb7e..000000000 --- a/dev-libs/asmjit/asmjit-1.0_p22092020.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="complete x86/x64 JIT-Assembler for C++ language" -HOMEPAGE="https://asmjit.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/asmjit/asmjit" -else - COMMIT=b49d685cd9e2e4488f55ce6004306a79bdea056b - SRC_URI="https://github.com/asmjit/asmjit/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT} - KEYWORDS="~amd64" -fi - -SLOT="0" -LICENSE="BSD" -IUSE="natvis static-libs test" -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DASMJIT_EMBED=$(usex static-libs) - -DASMJIT_BUILD_X86=ON - -DASMJIT_NO_NATVIS=$(usex natvis) - -DASMJIT_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/asmjit/asmjit-9999.ebuild b/dev-libs/asmjit/asmjit-9999.ebuild deleted file mode 100644 index 097ccfb7e..000000000 --- a/dev-libs/asmjit/asmjit-9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="complete x86/x64 JIT-Assembler for C++ language" -HOMEPAGE="https://asmjit.com/" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/asmjit/asmjit" -else - COMMIT=b49d685cd9e2e4488f55ce6004306a79bdea056b - SRC_URI="https://github.com/asmjit/asmjit/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/${PN}-${COMMIT} - KEYWORDS="~amd64" -fi - -SLOT="0" -LICENSE="BSD" -IUSE="natvis static-libs test" -RESTRICT="!test? ( test )" - -src_configure() { - local mycmakeargs=( - -DASMJIT_EMBED=$(usex static-libs) - -DASMJIT_BUILD_X86=ON - -DASMJIT_NO_NATVIS=$(usex natvis) - -DASMJIT_TEST=$(usex test) - ) - cmake_src_configure -} diff --git a/dev-libs/asmjit/metadata.xml b/dev-libs/asmjit/metadata.xml deleted file mode 100644 index d8cc7be33..000000000 --- a/dev-libs/asmjit/metadata.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>xarthisius@gentoo.org</email> - <name>Kacper Kowalik</name> - </maintainer> - <maintainer type="person"> - <email>gentoo@aisha.cc</email> - <name>Aisha Tammy</name> - </maintainer> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> - AsmJit is complete x86/x64 JIT-Assembler for C++ language. It supports - 32/64-bit x86 processors including all usable extensions (FPU, MMX, - 3dNow, SSE, SSE2, SSE3 and SSE4) through type-safe API that mimics Intel - assembler syntax and eliminates nearly all common mistakes that can be - done by developers. - - AsmJit contains also high-level code generation classes that can be used - as a portable way to create JIT code that should run on all supported - architectures. High-level classes can handle various function - calling-conventions, register allocation and 32/64-bit mode differences. - </longdescription> - <use> - <flag name="natvis">build natvis files</flag> - </use> -</pkgmetadata> diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest deleted file mode 100644 index 34653ed7e..000000000 --- a/dev-libs/boost/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 diff --git a/dev-libs/boost/boost-1.72.0-r2.ebuild b/dev-libs/boost/boost-1.72.0-r2.ebuild deleted file mode 100644 index dffb3e5f9..000000000 --- a/dev-libs/boost/boost-1.72.0-r2.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal - -MY_PV="$(ver_rs 1- _)" -MAJOR_V="$(ver_cut 1-2)" - -DESCRIPTION="Boost Libraries for C++" -HOMEPAGE="https://www.boost.org/" -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2" - -LICENSE="Boost-1.0" -SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~amd64" -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" -REQUIRED_USE=" - mpi? ( threads ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# the tests will never fail because these are not intended as sanity -# tests at all. They are more a way for upstream to check their own code -# on new compilers. Since they would either be completely unreliable -# (failing for no good reason) or completely useless (never failing) -# there is no point in having them in the ebuild to begin with. -RESTRICT="test" - -RDEPEND=" - bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) - python? ( - ${PYTHON_DEPS} - numpy? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' -3) ) - ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="=dev-util/boost-build-${MAJOR_V}*" - -S="${WORKDIR}/${PN}_${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch - "${FILESDIR}"/${PN}-1.71.0-context-x32.patch - "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch - # Bug 703294, incomplete Boost.Serialization refactoring - "${FILESDIR}"/${PN}-1.72.0-missing-serialization-split_member-include.patch - # Bug 703036, per python-impl Boost.MPI - "${FILESDIR}"/${PN}-1.72.0-boost-mpi-python.patch - # Bug 704128, missing include on Boost.Ranges - "${FILESDIR}"/${PN}-1.72.0-revert-cease-dependence-on-range.patch -) - -python_bindings_needed() { - multilib_is_native_abi && use python -} - -tools_needed() { - multilib_is_native_abi && use tools -} - -create_user-config.jam() { - local user_config_jam="${BUILD_DIR}"/user-config.jam - if [[ -s ${user_config_jam} ]]; then - einfo "${user_config_jam} already exists, skipping configuration" - return - else - einfo "Creating configuration in ${user_config_jam}" - fi - - local compiler compiler_version compiler_executable="$(tc-getCXX)" - if [[ ${CHOST} == *-darwin* ]]; then - compiler="darwin" - compiler_version="$(gcc-fullversion)" - else - compiler="gcc" - compiler_version="$(gcc-version)" - fi - - if use mpi; then - local mpi_configuration="using mpi ;" - fi - - cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : <cflags>"${CFLAGS}" <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ; - ${mpi_configuration} - __EOF__ - - if python_bindings_needed; then - append_to_user_config() { - local py_config - if tc-is-cross-compiler; then - py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;" - else - py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;" - fi - echo "${py_config}" >> "${user_config_jam}" || die - } - python_foreach_impl append_to_user_config - fi - - if python_bindings_needed && use numpy; then - einfo "Enabling support for NumPy extensions in Boost.Python" - else - einfo "Disabling support for NumPy extensions in Boost.Python" - - # Boost.Build does not allow for disabling of numpy - # extensions, thereby leading to automagic numpy - # https://github.com/boostorg/python/issues/111#issuecomment-280447482 - sed \ - -e 's/\[ unless \[ python\.numpy \] : <build>no \]/<build>no/g' \ - -i "${BUILD_DIR}"/libs/python/build/Jamfile || die - fi -} - -pkg_setup() { - # Bail out on unsupported build configuration, bug #456792 - if [[ -f "${EROOT}"/etc/site-config.jam ]]; then - if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}"/etc/site-config.jam; then - eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets." - eerror "Boost can not be built in such configuration." - eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it." - die "Unsupported target in ${EROOT}/etc/site-config.jam" - fi - fi -} - -src_prepare() { - default - multilib_copy_sources -} - -ejam() { - create_user-config.jam - - local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" ) - if python_bindings_needed; then - append_to_b2_opts() { - b2_opts+=( python="${EPYTHON#python}" ) - } - python_foreach_impl append_to_b2_opts - else - b2_opts+=( --without-python ) - fi - b2_opts+=( "$@" ) - - echo b2 "${b2_opts[@]}" >&2 - b2 "${b2_opts[@]}" -} - -src_configure() { - # Workaround for too many parallel processes requested, bug #506064 - [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64" - - OPTIONS=( - $(usex debug gentoodebug gentoorelease) - "-j$(makeopts_jobs)" - -q - -d+2 - pch=off - $(usex icu "-sICU_PATH=${ESYSROOT}/usr" '--disable-icu boost.locale.icu=off') - $(usex mpi '' '--without-mpi') - $(usex nls '' '--without-locale') - $(usex context '' '--without-context --without-coroutine --without-fiber') - $(usex threads '' '--without-thread') - --without-stacktrace - --boost-build="${BROOT}"/usr/share/boost-build - --prefix="${ED}/usr" - --layout=system - # CMake has issues working with multiple python impls, - # disable cmake config generation for the time being - # https://github.com/boostorg/python/issues/262#issuecomment-483069294 - --no-cmake-config - # building with threading=single is currently not possible - # https://svn.boost.org/trac/boost/ticket/7105 - threading=multi - link=$(usex static-libs shared,static shared) - # this seems to be the only way to disable compression algorithms - # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build - -sNO_BZIP2=$(usex bzip2 0 1) - -sNO_LZMA=$(usex lzma 0 1) - -sNO_ZLIB=$(usex zlib 0 1) - -sNO_ZSTD=$(usex zstd 0 1) - ) - - if [[ ${CHOST} == *-darwin* ]]; then - # We need to add the prefix, and in two cases this exceeds, so prepare - # for the largest possible space allocation. - append-ldflags -Wl,-headerpad_max_install_names - fi - - # Use C++14 globally as of 1.62 - append-cxxflags -std=c++14 -} - -multilib_src_compile() { - ejam "${OPTIONS[@]}" || die - - if tools_needed; then - pushd tools >/dev/null || die - ejam \ - "${OPTIONS[@]}" \ - || die "Building of Boost tools failed" - popd >/dev/null || die - fi -} - -multilib_src_install_all() { - if ! use numpy; then - rm -r "${ED}"/usr/include/boost/python/numpy* || die - fi - - if use python; then - if use mpi; then - move_mpi_py_into_sitedir() { - local pyver="${EPYTHON#python}" - python_moduleinto boost - python_domodule "${ED}"/usr/$(get_libdir)/mpi${pyver/./}.so - rm "${ED}"/usr/$(get_libdir)/mpi${pyver/./}* || die - dosym mpi${pyver/./}.so $(python_get_sitedir)/boost/mpi.so - - # create a proper python package - touch "${D}"/$(python_get_sitedir)/boost/__init__.py || die - python_optimize - } - python_foreach_impl move_mpi_py_into_sitedir - else - rm -r "${ED}"/usr/include/boost/mpi/python* || die - fi - else - rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die - fi - - if ! use nls; then - rm -r "${ED}"/usr/include/boost/locale || die - fi - - if ! use context; then - rm -r "${ED}"/usr/include/boost/context || die - rm -r "${ED}"/usr/include/boost/coroutine{,2} || die - rm "${ED}"/usr/include/boost/asio/spawn.hpp || die - fi - - if use doc; then - # find extraneous files that shouldn't be installed - # as part of the documentation and remove them. - find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die - find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die - find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die - - docinto html - dodoc *.{htm,html,png,css} - dodoc -r doc libs more tools - - # To avoid broken links - dodoc LICENSE_1_0.txt - - dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost - fi -} - -multilib_src_install() { - ejam \ - "${OPTIONS[@]}" \ - --includedir="${ED}/usr/include" \ - --libdir="${ED}/usr/$(get_libdir)" \ - install || die "Installation of Boost libraries failed" - - pushd "${ED}/usr/$(get_libdir)" >/dev/null || die - - local ext=$(get_libname) - if use threads; then - local f - for f in *${ext}; do - dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}} - done - fi - - popd >/dev/null || die - - if tools_needed; then - dobin dist/bin/* - - insinto /usr/share - doins -r dist/share/boostbook - fi - - # boost's build system truely sucks for not having a destdir. Because for - # this reason we are forced to build with a prefix that includes the - # DESTROOT, dynamic libraries on Darwin end messed up, referencing the - # DESTROOT instread of the actual EPREFIX. There is no way out of here - # but to do it the dirty way of manually setting the right install_names. - if [[ ${CHOST} == *-darwin* ]]; then - einfo "Working around completely broken build-system(tm)" - local d - for d in "${ED}"/usr/lib/*.dylib; do - if [[ -f ${d} ]]; then - # fix the "soname" - ebegin " correcting install_name of ${d#${ED}}" - install_name_tool -id "/${d#${D}}" "${d}" - eend $? - # fix references to other libs - refs=$(otool -XL "${d}" | \ - sed -e '1d' -e 's/^\t//' | \ - grep "^libboost_" | \ - cut -f1 -d' ') - local r - for r in ${refs}; do - ebegin " correcting reference to ${r}" - install_name_tool -change \ - "${r}" \ - "${EPREFIX}/usr/lib/${r}" \ - "${d}" - eend $? - done - fi - done - fi -} - -pkg_preinst() { - # Yai for having symlinks that are nigh-impossible to remove without - # resorting to dirty hacks like these. Removes lingering symlinks - # from the slotted versions. - local symlink - for symlink in "${EROOT}"/usr/include/boost "${EROOT}"/usr/share/boostbook; do - if [[ -L ${symlink} ]]; then - rm -f "${symlink}" || die - fi - done - - # some ancient installs still have boost cruft lying around - # for unknown reasons, causing havoc for reverse dependencies - # Bug: 607734 - rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die -} - -pkg_postinst() { - elog "Boost.Regex is *extremely* ABI sensitive. If you get errors such as" - elog - elog " undefined reference to \`boost::re_detail_$(ver_cut 1)0$(ver_cut 2)00::cpp_regex_traits_implementation" - elog " <char>::transform_primary[abi:cxx11](char const*, char const*) const'" - elog - elog "Then you need to recompile Boost and all its reverse dependencies" - elog "using the same toolchain. In general, *every* change of the C++ toolchain" - elog "requires a complete rebuild of the boost-dependent ecosystem." - elog - elog "See for instance https://bugs.gentoo.org/638138" -} diff --git a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch b/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch deleted file mode 100644 index ca793b9d0..000000000 --- a/dev-libs/boost/files/boost-1.71.0-build-auto_index-tool.patch +++ /dev/null @@ -1,13 +0,0 @@ -Build auto_index tool with USE="tools" -See also: https://bugs.gentoo.org/529066 - ---- a/tools/Jamfile.v2 -+++ b/tools/Jamfile.v2 -@@ -18,6 +18,7 @@ - ; - - TOOLS = -+ auto_index/build//auto_index - bcp//bcp - inspect/build//inspect - quickbook//quickbook diff --git a/dev-libs/boost/files/boost-1.71.0-context-x32.patch b/dev-libs/boost/files/boost-1.71.0-context-x32.patch deleted file mode 100644 index 9ee3d545d..000000000 --- a/dev-libs/boost/files/boost-1.71.0-context-x32.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S -@@ -24,6 +24,10 @@ - * * - ****************************************************************************************/ - -+#ifdef __x86_64__ -+#include "jump_x86_64_sysv_elf_gas.S" -+#else -+ - .file "jump_i386_sysv_elf_gas.S" - .text - .globl jump_fcontext -@@ -81,3 +85,5 @@ - - /* Mark that we don't need executable stack. */ - .section .note.GNU-stack,"",%progbits -+ -+#endif ---- a/libs/context/src/asm/make_i386_sysv_elf_gas.S -+++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S -@@ -24,6 +24,10 @@ - * * - ****************************************************************************************/ - -+#ifdef __x86_64__ -+#include "make_x86_64_sysv_elf_gas.S" -+#else -+ - .file "make_i386_sysv_elf_gas.S" - .text - .globl make_fcontext -@@ -105,3 +109,5 @@ - - /* Mark that we don't need executable stack. */ - .section .note.GNU-stack,"",%progbits -+ -+#endif diff --git a/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch b/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch deleted file mode 100644 index 32faf8d0e..000000000 --- a/dev-libs/boost/files/boost-1.71.0-disable_icu_rpath.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/libs/locale/build/Jamfile.v2 -+++ b/libs/locale/build/Jamfile.v2 -@@ -65,8 +65,8 @@ - - if $(ICU_LINK) - { -- ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <runtime-link>shared ; -- ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin64 <runtime-link>shared ; -+ ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; -+ ICU64_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <runtime-link>shared ; - } - else - { -@@ -124,7 +124,6 @@ - <library>icuuc/<link>shared/<runtime-link>shared - <library>icudt/<link>shared/<runtime-link>shared - <library>icuin/<link>shared/<runtime-link>shared -- <dll-path>$(ICU_PATH)/bin - <runtime-link>shared ; - - -@@ -183,7 +182,6 @@ - <library>icuuc_64/<link>shared/<runtime-link>shared - <library>icudt_64/<link>shared/<runtime-link>shared - <library>icuin_64/<link>shared/<runtime-link>shared -- <dll-path>$(ICU_PATH)/bin64 - <runtime-link>shared ; - - diff --git a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch b/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch deleted file mode 100644 index 8fb164a62..000000000 --- a/dev-libs/boost/files/boost-1.72.0-boost-mpi-python.patch +++ /dev/null @@ -1,50 +0,0 @@ -Tag Boost.MPI python impls properly to avoid name clash -https://github.com/boostorg/mpi/issues/112 - ---- a/boostcpp.jam -+++ b/boostcpp.jam -@@ -185,7 +185,7 @@ - - rule tag ( name : type ? : property-set ) - { -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION - { - local args = $(.format-name-args) ; - if $(layout) = versioned -@@ -223,7 +223,7 @@ - { - local result = $(name) ; - -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION - { - # Add Python version suffix - ---- a/libs/mpi/build/Jamfile.v2 -+++ b/libs/mpi/build/Jamfile.v2 -@@ -58,13 +58,13 @@ - rule python-tag ( name : type ? : property-set ) - { - local result = $(name) ; -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION - { - local version = [ $(property-set).get <python> ] ; - local lib-suffix = [ version-suffix $(version) ] ; - result = $(result)$(lib-suffix) ; - } -- if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB && $(PYTHON_ID) -+ if $(type) in STATIC_LIB SHARED_LIB IMPORT_LIB PYTHON_EXTENSION && $(PYTHON_ID) - { - result = $(result)-$(PYTHON_ID) ; - } -@@ -168,6 +168,8 @@ - <link>shared:<define>BOOST_PYTHON_DYN_LINK=1 - <link>shared <runtime-link>shared - <python-debugging>on:<define>BOOST_DEBUG_PYTHON -+ -<tag>@$(BOOST_JAMROOT_MODULE)%$(BOOST_JAMROOT_MODULE).tag -+ <tag>@$(__name__).python-tag - ; - - mpi_python_libs = boost_mpi_python mpi ; diff --git a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch b/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch deleted file mode 100644 index 0c9f72583..000000000 --- a/dev-libs/boost/files/boost-1.72.0-missing-serialization-split_member-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -Missing #include, as the split_member.hpp include is not -part of the nvp.hpp interface, and hence cannot be relied -upon to be included transitively. - -Confirmed on -https://github.com/boostorg/serialization/commit/c32a663c9963385430abc563f9c85f94d8da43a9#r36528430 - -Bug: https://bugs.gentoo.org/703294 - ---- a/boost/bimap/detail/map_view_iterator.hpp -+++ b/boost/bimap/detail/map_view_iterator.hpp -@@ -22,6 +22,7 @@ - - #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION - #include <boost/serialization/nvp.hpp> -+ #include <boost/serialization/split_member.hpp> - #endif // BOOST_BIMAP_DISABLE_SERIALIZATION - - #include <boost/iterator/detail/enable_if.hpp> ---- a/boost/bimap/detail/set_view_iterator.hpp -+++ b/boost/bimap/detail/set_view_iterator.hpp -@@ -22,6 +22,7 @@ - - #ifndef BOOST_BIMAP_DISABLE_SERIALIZATION - #include <boost/serialization/nvp.hpp> -+ #include <boost/serialization/split_member.hpp> - #endif // BOOST_BIMAP_DISABLE_SERIALIZATION - - #include <boost/iterator/detail/enable_if.hpp> diff --git a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch b/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch deleted file mode 100644 index a6002074a..000000000 --- a/dev-libs/boost/files/boost-1.72.0-revert-cease-dependence-on-range.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 436e1dbe6fcd31523d261d18ad011392f1d6fbbc Mon Sep 17 00:00:00 2001 -From: Oliver Kowalke <oliver.kowalke@gmail.com> -Date: Sun, 1 Dec 2019 20:40:28 +0100 -Subject: [PATCH] Revert "Cease dependence on Range" - -This reverts commit 0c556bb59241e682bbcd3f572815149c5a9b17db. - -see #44 (One test fails to compile after boostorg/coroutine submodule updated) ---- - boost/coroutine/asymmetric_coroutine.hpp | 12 +++--------- - 1 file changed, 3 insertions(+), 9 deletions(-) - -diff --git a/boost/coroutine/asymmetric_coroutine.hpp b/boost/coroutine/asymmetric_coroutine.hpp -index ea96981..640896f 100644 ---- a/boost/coroutine/asymmetric_coroutine.hpp -+++ b/boost/coroutine/asymmetric_coroutine.hpp -@@ -14,6 +14,7 @@ - #include <boost/assert.hpp> - #include <boost/config.hpp> - #include <boost/move/move.hpp> -+#include <boost/range.hpp> - #include <boost/throw_exception.hpp> - #include <boost/utility/explicit_operator_bool.hpp> - -@@ -2354,19 +2355,12 @@ end( push_coroutine< R > & c) - - } - --// forward declaration of Boost.Range traits to break dependency on it --template<typename C, typename Enabler> --struct range_mutable_iterator; -- --template<typename C, typename Enabler> --struct range_const_iterator; -- - template< typename Arg > --struct range_mutable_iterator< coroutines::push_coroutine< Arg >, void > -+struct range_mutable_iterator< coroutines::push_coroutine< Arg > > - { typedef typename coroutines::push_coroutine< Arg >::iterator type; }; - - template< typename R > --struct range_mutable_iterator< coroutines::pull_coroutine< R >, void > -+struct range_mutable_iterator< coroutines::pull_coroutine< R > > - { typedef typename coroutines::pull_coroutine< R >::iterator type; }; - - } --- -2.24.1 - diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml deleted file mode 100644 index 4f031402a..000000000 --- a/dev-libs/boost/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <description>Gentoo Science Project</description> - </maintainer> - <use> - <flag name="context">Build and install the Boost.Context (and Boost.Fiber) library and all other Boost libraries that depend on it</flag> - <flag name="debug">Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.</flag> - <flag name="doc">Install the full API documentation documentation. This takes over 200MB of extra disk space.</flag> - <flag name="nls">Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.</flag> - <flag name="numpy">Optionally build NumPy extensions when Boost.Python is enabled</flag> - <flag name="threads">Build multi-thread-compatible libraries instead of single-threaded only.</flag> - <flag name="tools">Build and install the boost tools (bcp, quickbook, inspect, wave)</flag> - </use> - <upstream> - <remote-id type="cpe">cpe:/a:boost:boost</remote-id> - <remote-id type="sourceforge">boost</remote-id> - </upstream> -</pkgmetadata> diff --git a/dev-libs/intel-common/Manifest b/dev-libs/intel-common/Manifest deleted file mode 100644 index 21dea448d..000000000 --- a/dev-libs/intel-common/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST parallel_studio_xe_2018_update2_professional_edition.tgz 3877755304 BLAKE2B c8852df23abf080f482002a37af7781b3fbae3ecec448914ea5a237fa2b925073d1a3dc2dd94ba64002ff0f6c7e9b18b25fa7ada811a83b10344eb9b92cb37ff SHA512 a9b644b0305d83a9d0daa14d146cb3ce79949db55a410afe48d62259414e6256d9ef533a04bb50807103511db2016c4abcbbf769146854a25638f402a6d0f2be -DIST parallel_studio_xe_2019_update3_professional_edition.tgz 4777019188 BLAKE2B 1ebbc23d1370bb396b452dc73d4a79b4ea7be0e304e3d38b3cba77372df6af097ea1109535d166b56a6c50e28e3330a1ed49c6a9270411b14ccf48f32a9eaedd SHA512 622b1a8877f06247a0a93cb98d2cc6d5b359aa2c9cf7ff6f45a8e1dca34fecea10d603d632a7b3454d809d6e38cb860b40ae3f782e250279768937af6ceb015d -DIST parallel_studio_xe_2019_update4_professional_edition.tgz 2629662464 BLAKE2B a5619f33535063ccd7310378504ca960aa8512527cef7e0884fae5570633c1823e50ff7135adbbc571b4d47e0b6fcc01afe8639e09feb50a7f289eeec3f61ca0 SHA512 d8f6780a3671f30a1bad5d3a9792062c73b31188dc31fbd38212e98abc593f1c8f64bb970a8a4fce9ce237afef18ed38adf8fd81aa73b63ec964224590d4a34d -DIST parallel_studio_xe_2020_update1_professional_edition.tgz 2783012958 BLAKE2B 975103ec4551a0e3bd84034ce771a5fc459d5de47f4247b5915b54d9c827e50e913f9054a103424b764f730190675d42b52a97e68551b34df6b3d8d9b922517a SHA512 00a3334bcdb8b30216ecb40fcfc709b27d043697606a53f522c90b05cf8598e1e60311d629ec17b6fe1016a7d2a27f4b428abddc9eba39badebfd8a9b53de404 diff --git a/dev-libs/intel-common/intel-common-18.0.2.199-r1.ebuild b/dev-libs/intel-common/intel-common-18.0.2.199-r1.ebuild deleted file mode 100644 index 5397d76b6..000000000 --- a/dev-libs/intel-common/intel-common-18.0.2.199-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -INTEL_DIST_SKU=3235 -INTEL_DIST_PV=2018_update2_professional_edition - -inherit intel-sdp-r1 - -DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries" -HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/" - -IUSE="+compiler doc +mpi +openmp" -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" - -CHECKREQS_DISK_BUILD=750M - -INTEL_DIST_BIN_RPMS=() -INTEL_DIST_DAT_RPMS=( - "c-comp-common-18.0.2-199-18.0.2-199.noarch.rpm" - "comp-l-all-common-18.0.2-199-18.0.2-199.noarch.rpm" - "comp-l-all-vars-18.0.2-199-18.0.2-199.noarch.rpm" - "comp-nomcu-vars-18.0.2-199-18.0.2-199.noarch.rpm") -INTEL_DIST_X86_RPMS=( - "comp-32bit-18.0.2-199-18.0.2-199.x86_64.rpm" - "comp-ps-32bit-18.0.2-199-18.0.2-199.x86_64.rpm" - "comp-ps-ss-bec-32bit-18.0.2-199-18.0.2-199.x86_64.rpm") -INTEL_DIST_AMD64_RPMS=( - "comp-18.0.2-199-18.0.2-199.x86_64.rpm" - "comp-ps-18.0.2-199-18.0.2-199.x86_64.rpm" - "comp-ps-ss-18.0.2-199-18.0.2-199.x86_64.rpm" - "comp-ps-ss-bec-18.0.2-199-18.0.2-199.x86_64.rpm") - -pkg_setup() { - if use doc; then - INTEL_DIST_DAT_RPMS+=( "comp-doc-18.0-18.0.2-199.noarch.rpm" ) - fi - - if use mpi; then - INTEL_DIST_AMD64_RPMS+=( "mpi-rt-2018.2-199-2018.2-199.x86_64.rpm" ) - - if use doc; then - INTEL_DIST_DAT_RPMS+=( "mpi-doc-2018-2018.2-199.x86_64.rpm" ) - fi - fi - - if use openmp; then - INTEL_DIST_DAT_RPMS+=( "openmp-common-18.0.2-199-18.0.2-199.noarch.rpm" ) - INTEL_DIST_AMD64_RPMS+=( "openmp-18.0.2-199-18.0.2-199.x86_64.rpm" ) - INTEL_DIST_X86_RPMS+=( "openmp-32bit-18.0.2-199-18.0.2-199.x86_64.rpm" ) - - if use compiler; then - INTEL_DIST_DAT_RPMS+=( - "openmp-common-icc-18.0.2-199-18.0.2-199.noarch.rpm" - "openmp-common-ifort-18.0.2-199-18.0.2-199.noarch.rpm") - INTEL_DIST_AMD64_RPMS+=( - "openmp-ifort-18.0.2-199-18.0.2-199.x86_64.rpm") - INTEL_DIST_X86_RPMS+=( - "openmp-ifort-32bit-18.0.2-199-18.0.2-199.x86_64.rpm") - fi - fi -} - -src_install() { - intel-sdp-r1_src_install - local path rootpath ldpath arch fenv=35intelsdp - cat > ${fenv} <<-EOF - NLSPATH=$(isdp_get-sdp-edir)/linux/compiler/lib/$(isdp_get-native-abi-arch)/locale/en_US/%N - INTEL_LICENSE_FILE=${EPREFIX}/opt/intel/licenses:$(isdp_get-sdp-edir)/licenses - EOF - for arch in $(isdp_get-sdp-installed-arches); do - path="${path}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/compiler/lib/${arch}" - done - if use mpi && use amd64; then - path="${path}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/lib/" - fi - cat >> ${fenv} <<-EOF - PATH=${path#:} - ROOTPATH=${rootpath#:} - LDPATH=${ldpath#:} - EOF - - doenvd ${fenv} - - cat >> "${T}"/40-${PN} <<- EOF - SEARCH_DIRS_MASK=$(isdp_get-sdp-edir) - EOF - insinto /etc/revdep-rebuild/ - doins "${T}"/40-${PN} -} diff --git a/dev-libs/intel-common/intel-common-19.0.3.199-r1.ebuild b/dev-libs/intel-common/intel-common-19.0.3.199-r1.ebuild deleted file mode 100644 index dc06e4551..000000000 --- a/dev-libs/intel-common/intel-common-19.0.3.199-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -INTEL_DIST_PV=2019_update3_professional_edition - -inherit intel-sdp-r1 - -DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries" -HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/" - -IUSE="+compiler doc +mpi +openmp" -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" - -SLOT="0" - -MY_PV=$(ver_rs 3 '-') # 19.0.3-199 -MY_PV2=$(ver_cut 1-2) # 19.0 -MY_PV3='20'$(ver_cut 1) # 2019 -MY_PV4="${MY_PV3}."$(ver_cut 3)'-'$(ver_cut 4) # 2019.3-199 - -CHECKREQS_DISK_BUILD=750M - -INTEL_DIST_BIN_RPMS=() -INTEL_DIST_DAT_RPMS=( - "c-comp-common-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-l-all-common-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-l-all-vars-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-nomcu-vars-${MY_PV}-${MY_PV}.noarch.rpm") -INTEL_DIST_X86_RPMS=( - "comp-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-bec-32bit-${MY_PV}-${MY_PV}.x86_64.rpm") -INTEL_DIST_AMD64_RPMS=( - "comp-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-bec-${MY_PV}-${MY_PV}.x86_64.rpm") - -pkg_setup() { - if use doc; then - INTEL_DIST_DAT_RPMS+=( "comp-doc-${MY_PV2}-${MY_PV}.noarch.rpm" ) - fi - - if use mpi; then - INTEL_DIST_AMD64_RPMS+=( "mpi-rt-${MY_PV4}-${MY_PV4}.x86_64.rpm" ) - - if use doc; then - INTEL_DIST_DAT_RPMS+=( "mpi-doc-${MY_PV3}-${MY_PV4}.x86_64.rpm" ) - fi - fi - - if use openmp; then - INTEL_DIST_DAT_RPMS+=( "openmp-common-${MY_PV}-${MY_PV}.noarch.rpm" ) - INTEL_DIST_AMD64_RPMS+=( "openmp-${MY_PV}-${MY_PV}.x86_64.rpm" ) - INTEL_DIST_X86_RPMS+=( "openmp-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" ) - - if use compiler; then - INTEL_DIST_DAT_RPMS+=( - "openmp-common-icc-${MY_PV}-${MY_PV}.noarch.rpm" - "openmp-common-ifort-${MY_PV}-${MY_PV}.noarch.rpm") - INTEL_DIST_AMD64_RPMS+=( - "openmp-ifort-${MY_PV}-${MY_PV}.x86_64.rpm") - INTEL_DIST_X86_RPMS+=( - "openmp-ifort-32bit-${MY_PV}-${MY_PV}.x86_64.rpm") - fi - fi -} - -src_install() { - intel-sdp-r1_src_install - local path rootpath ldpath arch fenv=35intelsdp - cat > ${fenv} <<-EOF - NLSPATH=$(isdp_get-sdp-edir)/linux/compiler/lib/$(isdp_get-native-abi-arch)/locale/en_US/%N - INTEL_LICENSE_FILE=${EPREFIX}/opt/intel/licenses:$(isdp_get-sdp-edir)/licenses - EOF - for arch in $(isdp_get-sdp-installed-arches); do - path="${path}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/compiler/lib/${arch}" - done - if use mpi && use amd64; then - path="${path}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/lib/" - fi - cat >> ${fenv} <<-EOF - PATH=${path#:} - ROOTPATH=${rootpath#:} - LDPATH=${ldpath#:} - EOF - - doenvd ${fenv} - - cat >> "${T}"/40-${PN} <<- EOF - SEARCH_DIRS_MASK=$(isdp_get-sdp-edir) - EOF - insinto /etc/revdep-rebuild/ - doins "${T}"/40-${PN} -} diff --git a/dev-libs/intel-common/intel-common-19.0.4.243.ebuild b/dev-libs/intel-common/intel-common-19.0.4.243.ebuild deleted file mode 100644 index df8f5574c..000000000 --- a/dev-libs/intel-common/intel-common-19.0.4.243.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -INTEL_DIST_PV=2019_update4_professional_edition - -inherit intel-sdp-r1 - -DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries" -HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/" - -IUSE="+compiler doc +mpi +openmp" -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" - -SLOT="0" - -MY_PV=$(ver_rs 3 '-') # 19.0.3-199 -MY_PV2=$(ver_cut 1-2) # 19.0 -MY_PV3='20'$(ver_cut 1) # 2019 -MY_PV4="${MY_PV3}."$(ver_cut 3)'-'$(ver_cut 4) # 2019.3-199 - -CHECKREQS_DISK_BUILD=750M - -INTEL_DIST_BIN_RPMS=() -INTEL_DIST_DAT_RPMS=( - "c-comp-common-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-l-all-common-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-l-all-vars-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-nomcu-vars-${MY_PV}-${MY_PV}.noarch.rpm") -INTEL_DIST_X86_RPMS=( - "comp-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-bec-32bit-${MY_PV}-${MY_PV}.x86_64.rpm") -INTEL_DIST_AMD64_RPMS=( - "comp-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-bec-${MY_PV}-${MY_PV}.x86_64.rpm") - -pkg_setup() { - if use doc; then - INTEL_DIST_DAT_RPMS+=( "comp-doc-${MY_PV2}-${MY_PV}.noarch.rpm" ) - fi - - if use mpi; then - INTEL_DIST_AMD64_RPMS+=( "mpi-rt-${MY_PV4}-${MY_PV4}.x86_64.rpm" ) - - if use doc; then - INTEL_DIST_DAT_RPMS+=( "mpi-doc-${MY_PV3}-${MY_PV4}.x86_64.rpm" ) - fi - fi - - if use openmp; then - INTEL_DIST_DAT_RPMS+=( "openmp-common-${MY_PV}-${MY_PV}.noarch.rpm" ) - INTEL_DIST_AMD64_RPMS+=( "openmp-${MY_PV}-${MY_PV}.x86_64.rpm" ) - INTEL_DIST_X86_RPMS+=( "openmp-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" ) - - if use compiler; then - INTEL_DIST_DAT_RPMS+=( - "openmp-common-icc-${MY_PV}-${MY_PV}.noarch.rpm" - "openmp-common-ifort-${MY_PV}-${MY_PV}.noarch.rpm") - INTEL_DIST_AMD64_RPMS+=( - "openmp-ifort-${MY_PV}-${MY_PV}.x86_64.rpm") - INTEL_DIST_X86_RPMS+=( - "openmp-ifort-32bit-${MY_PV}-${MY_PV}.x86_64.rpm") - fi - fi -} - -src_install() { - intel-sdp-r1_src_install - local path rootpath ldpath arch fenv=35intelsdp - cat > ${fenv} <<-EOF - NLSPATH=$(isdp_get-sdp-edir)/linux/compiler/lib/$(isdp_get-native-abi-arch)/locale/en_US/%N - INTEL_LICENSE_FILE=${EPREFIX}/opt/intel/licenses:$(isdp_get-sdp-edir)/licenses - EOF - for arch in $(isdp_get-sdp-installed-arches); do - path="${path}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/compiler/lib/${arch}" - done - if use mpi && use amd64; then - path="${path}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/lib/" - fi - cat >> ${fenv} <<-EOF - PATH=${path#:} - ROOTPATH=${rootpath#:} - LDPATH=${ldpath#:} - EOF - - doenvd ${fenv} - - cat >> "${T}"/40-${PN} <<- EOF - SEARCH_DIRS_MASK=$(isdp_get-sdp-edir) - EOF - insinto /etc/revdep-rebuild/ - doins "${T}"/40-${PN} -} diff --git a/dev-libs/intel-common/intel-common-19.1.1.217.ebuild b/dev-libs/intel-common/intel-common-19.1.1.217.ebuild deleted file mode 100644 index 4ba98edad..000000000 --- a/dev-libs/intel-common/intel-common-19.1.1.217.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -INTEL_DIST_PV=2020_update1_professional_edition - -inherit intel-sdp-r1 - -DESCRIPTION="Common libraries and utilities needed for Intel compilers and libraries" -HOMEPAGE="http://software.intel.com/en-us/articles/intel-compilers/" - -IUSE="+compiler doc +mpi +openmp" -KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" - -SLOT="0" - -MY_PV="$(ver_rs 3 '-')" # 19.1.1-217 -MY_PV2="$(ver_cut 1-2)" # 19.1 -MY_PV3="2019" # 2019 -MY_PV4="${MY_PV3}.7-$(ver_cut 4)" # 2019.7-217 sic! - -CHECKREQS_DISK_BUILD=750M - -QA_PREBUILT="*" - -INTEL_DIST_BIN_RPMS=() -INTEL_DIST_DAT_RPMS=( - "c-comp-common-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-l-all-common-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-l-all-vars-${MY_PV}-${MY_PV}.noarch.rpm" - "comp-nomcu-vars-${MY_PV}-${MY_PV}.noarch.rpm") -INTEL_DIST_X86_RPMS=( - "comp-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-bec-32bit-${MY_PV}-${MY_PV}.x86_64.rpm") -INTEL_DIST_AMD64_RPMS=( - "comp-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-${MY_PV}-${MY_PV}.x86_64.rpm" - "comp-ps-ss-bec-${MY_PV}-${MY_PV}.x86_64.rpm") - -pkg_setup() { - if use doc; then - INTEL_DIST_DAT_RPMS+=( "comp-doc-${MY_PV2}-${MY_PV}.noarch.rpm" ) - fi - - if use mpi; then - INTEL_DIST_AMD64_RPMS+=( "mpi-rt-${MY_PV4}-${MY_PV4}.x86_64.rpm" ) - - if use doc; then - INTEL_DIST_DAT_RPMS+=( "mpi-doc-${MY_PV3}-${MY_PV4}.x86_64.rpm" ) - fi - fi - - if use openmp; then - INTEL_DIST_DAT_RPMS+=( "openmp-common-${MY_PV}-${MY_PV}.noarch.rpm" ) - INTEL_DIST_AMD64_RPMS+=( "openmp-${MY_PV}-${MY_PV}.x86_64.rpm" ) - INTEL_DIST_X86_RPMS+=( "openmp-32bit-${MY_PV}-${MY_PV}.x86_64.rpm" ) - - if use compiler; then - INTEL_DIST_DAT_RPMS+=( - "openmp-common-icc-${MY_PV}-${MY_PV}.noarch.rpm" - "openmp-common-ifort-${MY_PV}-${MY_PV}.noarch.rpm") - INTEL_DIST_AMD64_RPMS+=( - "openmp-ifort-${MY_PV}-${MY_PV}.x86_64.rpm") - INTEL_DIST_X86_RPMS+=( - "openmp-ifort-32bit-${MY_PV}-${MY_PV}.x86_64.rpm") - fi - fi -} - -src_install() { - intel-sdp-r1_src_install - local path rootpath ldpath arch fenv=35intelsdp - cat > ${fenv} <<-EOF - NLSPATH=$(isdp_get-sdp-edir)/linux/compiler/lib/$(isdp_get-native-abi-arch)/locale/en_US/%N - INTEL_LICENSE_FILE=${EPREFIX}/opt/intel/licenses:$(isdp_get-sdp-edir)/licenses - EOF - for arch in $(isdp_get-sdp-installed-arches); do - path="${path}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/bin/${arch}" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/compiler/lib/${arch}" - done - if use mpi && use amd64; then - path="${path}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - rootpath="${rootpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/bin/" - ldpath="${ldpath}:$(isdp_get-sdp-edir)/linux/mpi/intel64/lib/" - fi - cat >> ${fenv} <<-EOF - PATH=${path#:} - ROOTPATH=${rootpath#:} - LDPATH=${ldpath#:} - EOF - - doenvd ${fenv} - - cat >> "${T}"/40-${PN} <<- EOF - SEARCH_DIRS_MASK=$(isdp_get-sdp-edir) - EOF - insinto /etc/revdep-rebuild/ - doins "${T}"/40-${PN} -} diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml deleted file mode 100644 index 026b5a33d..000000000 --- a/dev-libs/intel-common/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <name>Gentoo Science Project</name> - </maintainer> - <longdescription lang="en"> -This package contains the core files to be installed for the Intel -compilers and libraries. Probably useless if installed standalone. -</longdescription> - <use> - <flag name="compiler">Install the libraries needed for the icc and ifort compilers</flag> - </use> -</pkgmetadata> diff --git a/dev-libs/lief/lief-0.11.5.ebuild b/dev-libs/lief/lief-0.11.5.ebuild index 519729525..c2c38e5ba 100644 --- a/dev-libs/lief/lief-0.11.5.ebuild +++ b/dev-libs/lief/lief-0.11.5.ebuild @@ -4,7 +4,7 @@ EAPI=7 CMAKE_ECLASS=cmake -PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_COMPAT=( python3_10 pypy3 ) # Upstream has two alternate approaches to building its Python API: # 1. A working "CMakeList.txt" only supporting a single Python target. diff --git a/dev-libs/memkind/memkind-1.10.1.ebuild b/dev-libs/memkind/memkind-1.10.1.ebuild index 7aa39135a..df6efc9e4 100644 --- a/dev-libs/memkind/memkind-1.10.1.ebuild +++ b/dev-libs/memkind/memkind-1.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/memkind/memkind" else SRC_URI="https://github.com/memkind/memkind/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD" @@ -22,7 +22,7 @@ IUSE="+heap-manager openmp secure +tls" RESTRICT="test" DEPEND=" - sys-apps/ndctl + sys-block/ndctl sys-process/numactl " RDEPEND="${DEPEND}" diff --git a/dev-libs/memkind/memkind-1.11.0.ebuild b/dev-libs/memkind/memkind-1.11.0.ebuild index 047d3b9cd..df6efc9e4 100644 --- a/dev-libs/memkind/memkind-1.11.0.ebuild +++ b/dev-libs/memkind/memkind-1.11.0.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/memkind/memkind" else SRC_URI="https://github.com/memkind/memkind/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD" @@ -22,7 +22,7 @@ IUSE="+heap-manager openmp secure +tls" RESTRICT="test" DEPEND=" - sys-apps/ndctl + sys-block/ndctl sys-process/numactl " RDEPEND="${DEPEND}" diff --git a/dev-libs/memkind/memkind-9999.ebuild b/dev-libs/memkind/memkind-9999.ebuild index 7aa39135a..df6efc9e4 100644 --- a/dev-libs/memkind/memkind-9999.ebuild +++ b/dev-libs/memkind/memkind-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/memkind/memkind" else SRC_URI="https://github.com/memkind/memkind/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD" @@ -22,7 +22,7 @@ IUSE="+heap-manager openmp secure +tls" RESTRICT="test" DEPEND=" - sys-apps/ndctl + sys-block/ndctl sys-process/numactl " RDEPEND="${DEPEND}" diff --git a/dev-libs/oneCCL/Manifest b/dev-libs/oneCCL/Manifest new file mode 100644 index 000000000..2eb21d0f6 --- /dev/null +++ b/dev-libs/oneCCL/Manifest @@ -0,0 +1,3 @@ +DIST oneCCL-2021.10.tar.gz 37777252 BLAKE2B fb8d4429cbd7366efdd6e392d8132631c4dbc770962781a49b5b2df6e0c0a9b9b6c97043997066879b22ea85bf76e507bdcc27a78e40beffa7520d2a420b35ef SHA512 3ff845bf28e18c195411f5ed4542f172648feeb385fc456b6222d527018f48625c9be7e96a0f9b973f8af7ad1cc122a83ac8e169eeb59d5a35ed901910fdbace +DIST oneCCL-2021.7.1.tar.gz 35807233 BLAKE2B 0608b548f42c28983453a1e693c922aff0f6c77ffbf35f92b69113ba9fb02263bf8e1efa94ba47330559bb97b81493923cac10ce2c68c5fb50181677152fcc28 SHA512 e77d836afdcccbc2a1d2f9903916f17698a0d5ad795cd76dbb19a835375e89d0ecfa4695d87758e1ca6078bc23e30416d0a228ad3060816409b91851ad0b0790 +DIST oneCCL-2021.8.tar.gz 36868388 BLAKE2B b27f04efaddf2c31befd70388f0aa84b9cb5266b5d4e4a300064e0dc98e4d7eee3590288dc0b8cc1640fe0a9b928a0dfdf16a2ea45db9bd1517a8ca2dd00bdfe SHA512 879d1b73e594d5ff2c5a5aee08dfb4aded11c4974a9efcc199e7c2ee87b00c2441edb1dcb073bb4ed2587d752efcafe338072959b7b0f89fc1692dc377f748c2 diff --git a/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch b/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch new file mode 100644 index 000000000..e92608f4a --- /dev/null +++ b/dev-libs/oneCCL/files/oneCCL-2021.7.1-use-system-libs.patch @@ -0,0 +1,104 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74c4fc0..92c4d16 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,15 +87,13 @@ add_definitions(-DCCL_CXX_COMPILER="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILE + SET(CCL_ENABLE_ZE OFF CACHE BOOL "Enable Level Zero support") + + set(CCL_COMMON_INSTALL_PREFIX "intel64") +-set(CMAKE_INSTALL_LIBDIR "lib") + set(CCL_INSTALL_LIB "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + set(CCL_INSTALL_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(CCL_INSTALL_DOC "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}") + set(CCL_INSTALL_BIN "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") +-set(CCL_INSTALL_ENV "${CMAKE_INSTALL_PREFIX}/env") +-set(CCL_INSTALL_ETC "${CMAKE_INSTALL_PREFIX}/etc") +-set(CCL_INSTALL_LICENSE "${CMAKE_INSTALL_PREFIX}/licensing") +-set(CCL_INSTALL_MODULE "${CMAKE_INSTALL_PREFIX}/modulefiles") ++set(CCL_INSTALL_ENV "${CMAKE_INSTALL_FULL_SYSCONFDIR}/env") ++set(CCL_INSTALL_ETC "${CMAKE_INSTALL_FULL_SYSCONFDIR}") ++set(CCL_INSTALL_MODULE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/modulefiles") + set(CCL_INSTALL_EXAMPLES "${CMAKE_INSTALL_PREFIX}/examples") + set(CCL_INSTALL_TESTS "${CMAKE_INSTALL_PREFIX}/tests") + set(CCL_INSTALL_KERNELS "${CMAKE_INSTALL_PREFIX}/lib/kernels") +@@ -103,23 +101,23 @@ set(CCL_INSTALL_KERNELS "${CMAKE_INSTALL_PREFIX}/lib/kernels") + # setup dependency directories + set(DEPS_DIR "${PROJECT_SOURCE_DIR}/deps") + +-set(MPI_INCLUDE_DIR "${DEPS_DIR}/mpi/include/") +-set(MPI_LIB_DIR "${DEPS_DIR}/mpi/lib/") ++set(MPI_INCLUDE_DIR "/usr/include/") ++set(MPI_LIB_DIR "/usr/lib64/") + message(STATUS "MPI_INCLUDE_DIR: ${MPI_INCLUDE_DIR}") + message(STATUS "MPI_LIB_DIR: ${MPI_LIB_DIR}") + + if ("${LIBFABRIC_DIR}" STREQUAL "") +- set(LIBFABRIC_INCLUDE_DIR "${DEPS_DIR}/ofi/include") +- set(LIBFABRIC_LIB_DIR "${DEPS_DIR}/ofi/lib/") ++ set(LIBFABRIC_INCLUDE_DIR "${DEPS_DIR}/ofi/include/") ++ set(LIBFABRIC_LIB_DIR "${DEPS_DIR}/ofi/lib64/") + else() + set(LIBFABRIC_INCLUDE_DIR "${LIBFABRIC_DIR}/include/") +- set(LIBFABRIC_LIB_DIR "${LIBFABRIC_DIR}/lib") ++ set(LIBFABRIC_LIB_DIR "${LIBFABRIC_DIR}/lib64/") + endif() + message(STATUS "LIBFABRIC_LIB_DIR: ${LIBFABRIC_LIB_DIR}") + message(STATUS "LIBFABRIC_INCLUDE_DIR: ${LIBFABRIC_INCLUDE_DIR}") + +-set(HWLOC_INCLUDE_DIR "${DEPS_DIR}/hwloc/include/") +-set(HWLOC_LIB_DIR "${DEPS_DIR}/hwloc/lib/") ++set(HWLOC_INCLUDE_DIR "/usr/include/") ++set(HWLOC_LIB_DIR "/usr/lib64/") + message(STATUS "HWLOC_INCLUDE_DIR: ${HWLOC_INCLUDE_DIR}") + message(STATUS "HWLOC_LIB_DIR: ${HWLOC_LIB_DIR}") + +@@ -128,7 +126,7 @@ set(ITT_LIB_DIR "${DEPS_DIR}/itt/lib64") + message(STATUS "ITT_INCLUDE_DIR: ${ITT_INCLUDE_DIR}") + message(STATUS "ITT_LIB_DIR: ${ITT_LIB_DIR}") + +-set(LEVEL_ZERO_INCLUDE_DIR "${DEPS_DIR}/level_zero/include/") ++set(LEVEL_ZERO_INCLUDE_DIR "/usr/include/level_zero") + message(STATUS "LEVEL_ZERO_INCLUDE_DIR: ${LEVEL_ZERO_INCLUDE_DIR}") + + set(CMAKE_SKIP_INSTALL_RPATH TRUE) +@@ -241,8 +239,6 @@ configure_file(third-party-programs.txt ${CMAKE_CURRENT_BINARY_DIR}/third-party- + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vars.sh DESTINATION ${CCL_INSTALL_ENV}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/setvars.sh DESTINATION ${CCL_INSTALL_ENV}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/ccl DESTINATION ${CCL_INSTALL_MODULE}) +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/third-party-programs.txt DESTINATION ${CCL_INSTALL_LICENSE}) +-install(PROGRAMS ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CCL_INSTALL_LICENSE}) + + # copy kernels + if (COMPUTE_BACKEND AND EXISTS "${PROJECT_SOURCE_DIR}/src/kernels") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 7b4cff9..e8296a0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -263,8 +263,8 @@ list(APPEND SRC_LINK_LIBS + pthread + ${EXTERNAL_LIBS} + fabric +- ${HWLOC_LIB_DIR}/libhwloc.a +- ${ITT_LIB_DIR}/libittnotify.a) ++ libhwloc.so ++ libittnotify.so) + + if (ENABLE_MPI) + set(SRC_C_FLAGS "${SRC_C_FLAGS} -DCCL_ENABLE_MPI") +@@ -335,16 +335,3 @@ if ("${LIBFABRIC_DIR}" STREQUAL "") + install(DIRECTORY ${DEPS_DIR}/ofi/lib/ + DESTINATION ${CCL_INSTALL_LIB}) + endif() +- +-if (ENABLE_MPI) +- file(GLOB mpi_bins "${DEPS_DIR}/mpi/bin/*") +- install(PROGRAMS ${mpi_bins} DESTINATION ${CCL_INSTALL_BIN}) +- install(DIRECTORY ${DEPS_DIR}/mpi/include/ +- DESTINATION ${CCL_INSTALL_INCLUDE}) +- install(DIRECTORY ${DEPS_DIR}/mpi/lib/ +- DESTINATION ${CCL_INSTALL_LIB}) +- install(DIRECTORY ${DEPS_DIR}/mpi/etc/ +- DESTINATION ${CCL_INSTALL_ETC}) +- install(DIRECTORY ${DEPS_DIR}/mpi/licensing/ +- DESTINATION ${CCL_INSTALL_LICENSE}/mpi/) +-endif() diff --git a/dev-libs/oneCCL/files/oneCCL-2021.8-use-system-libs.patch b/dev-libs/oneCCL/files/oneCCL-2021.8-use-system-libs.patch new file mode 100644 index 000000000..dbb3a9e5f --- /dev/null +++ b/dev-libs/oneCCL/files/oneCCL-2021.8-use-system-libs.patch @@ -0,0 +1,104 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1e65ce9..cabbff9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,15 +109,13 @@ add_definitions(-DCCL_CXX_COMPILER="${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILE + SET(CCL_ENABLE_ZE OFF CACHE BOOL "Enable Level Zero support") + + set(CCL_COMMON_INSTALL_PREFIX "intel64") +-set(CMAKE_INSTALL_LIBDIR "lib") + set(CCL_INSTALL_LIB "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") + set(CCL_INSTALL_INCLUDE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") + set(CCL_INSTALL_DOC "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DOCDIR}") + set(CCL_INSTALL_BIN "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") +-set(CCL_INSTALL_ENV "${CMAKE_INSTALL_PREFIX}/env") +-set(CCL_INSTALL_ETC "${CMAKE_INSTALL_PREFIX}/etc") +-set(CCL_INSTALL_LICENSE "${CMAKE_INSTALL_PREFIX}/licensing") +-set(CCL_INSTALL_MODULE "${CMAKE_INSTALL_PREFIX}/modulefiles") ++set(CCL_INSTALL_ENV "${CMAKE_INSTALL_FULL_SYSCONFDIR}/env") ++set(CCL_INSTALL_ETC "${CMAKE_INSTALL_FULL_SYSCONFDIR}") ++set(CCL_INSTALL_MODULE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/modulefiles") + set(CCL_INSTALL_EXAMPLES "${CMAKE_INSTALL_PREFIX}/examples") + set(CCL_INSTALL_TESTS "${CMAKE_INSTALL_PREFIX}/tests") + set(CCL_INSTALL_KERNELS "${CMAKE_INSTALL_PREFIX}/lib/kernels") +@@ -125,23 +123,23 @@ set(CCL_INSTALL_KERNELS "${CMAKE_INSTALL_PREFIX}/lib/kernels") + # setup dependency directories + set(DEPS_DIR "${PROJECT_SOURCE_DIR}/deps") + +-set(MPI_INCLUDE_DIR "${DEPS_DIR}/mpi/include/") +-set(MPI_LIB_DIR "${DEPS_DIR}/mpi/lib/") ++set(MPI_INCLUDE_DIR "/usr/include/") ++set(MPI_LIB_DIR "/usr/lib64/") + message(STATUS "MPI_INCLUDE_DIR: ${MPI_INCLUDE_DIR}") + message(STATUS "MPI_LIB_DIR: ${MPI_LIB_DIR}") + + if ("${LIBFABRIC_DIR}" STREQUAL "") +- set(LIBFABRIC_INCLUDE_DIR "${DEPS_DIR}/ofi/include") +- set(LIBFABRIC_LIB_DIR "${DEPS_DIR}/ofi/lib/") ++ set(LIBFABRIC_INCLUDE_DIR "${DEPS_DIR}/ofi/include/") ++ set(LIBFABRIC_LIB_DIR "${DEPS_DIR}/ofi/lib64/") + else() + set(LIBFABRIC_INCLUDE_DIR "${LIBFABRIC_DIR}/include/") +- set(LIBFABRIC_LIB_DIR "${LIBFABRIC_DIR}/lib") ++ set(LIBFABRIC_LIB_DIR "${LIBFABRIC_DIR}/lib64/") + endif() + message(STATUS "LIBFABRIC_LIB_DIR: ${LIBFABRIC_LIB_DIR}") + message(STATUS "LIBFABRIC_INCLUDE_DIR: ${LIBFABRIC_INCLUDE_DIR}") + +-set(HWLOC_INCLUDE_DIR "${DEPS_DIR}/hwloc/include/") +-set(HWLOC_LIB_DIR "${DEPS_DIR}/hwloc/lib/") ++set(HWLOC_INCLUDE_DIR "/usr/include/") ++set(HWLOC_LIB_DIR "/usr/lib64/") + message(STATUS "HWLOC_INCLUDE_DIR: ${HWLOC_INCLUDE_DIR}") + message(STATUS "HWLOC_LIB_DIR: ${HWLOC_LIB_DIR}") + +@@ -150,7 +148,7 @@ set(ITT_LIB_DIR "${DEPS_DIR}/itt/lib64") + message(STATUS "ITT_INCLUDE_DIR: ${ITT_INCLUDE_DIR}") + message(STATUS "ITT_LIB_DIR: ${ITT_LIB_DIR}") + +-set(LEVEL_ZERO_INCLUDE_DIR "${DEPS_DIR}/level_zero/include/") ++set(LEVEL_ZERO_INCLUDE_DIR "/usr/include/level_zero") + message(STATUS "LEVEL_ZERO_INCLUDE_DIR: ${LEVEL_ZERO_INCLUDE_DIR}") + + message(STATUS "DRM_INCLUDE_DIR: ${DRM_INCLUDE_DIR}") +@@ -290,8 +288,6 @@ configure_file(third-party-programs.txt ${CMAKE_CURRENT_BINARY_DIR}/third-party- + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vars.sh DESTINATION ${CCL_INSTALL_ENV}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/setvars.sh DESTINATION ${CCL_INSTALL_ENV}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/ccl DESTINATION ${CCL_INSTALL_MODULE}) +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/third-party-programs.txt DESTINATION ${CCL_INSTALL_LICENSE}) +-install(PROGRAMS ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CCL_INSTALL_LICENSE}) + + # copy kernels + if (COMPUTE_BACKEND AND EXISTS "${PROJECT_SOURCE_DIR}/src/kernels") +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3948373..168a690 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -279,8 +279,8 @@ list(APPEND SRC_LINK_LIBS + dl + pthread + ${EXTERNAL_LIBS} +- ${HWLOC_LIB_DIR}/libhwloc.a +- ${ITT_LIB_DIR}/libittnotify.a) ++ libhwloc.so ++ libittnotify.so) + + if (ENABLE_MPI) + set(SRC_C_FLAGS "${SRC_C_FLAGS} -DCCL_ENABLE_MPI") +@@ -350,16 +350,3 @@ if ("${LIBFABRIC_DIR}" STREQUAL "") + install(DIRECTORY ${DEPS_DIR}/ofi/lib/ + DESTINATION ${CCL_INSTALL_LIB}) + endif() +- +-if (ENABLE_MPI) +- file(GLOB mpi_bins "${DEPS_DIR}/mpi/bin/*") +- install(PROGRAMS ${mpi_bins} DESTINATION ${CCL_INSTALL_BIN}) +- install(DIRECTORY ${DEPS_DIR}/mpi/include/ +- DESTINATION ${CCL_INSTALL_INCLUDE}) +- install(DIRECTORY ${DEPS_DIR}/mpi/lib/ +- DESTINATION ${CCL_INSTALL_LIB}) +- install(DIRECTORY ${DEPS_DIR}/mpi/etc/ +- DESTINATION ${CCL_INSTALL_ETC}) +- install(DIRECTORY ${DEPS_DIR}/mpi/licensing/ +- DESTINATION ${CCL_INSTALL_LICENSE}/mpi/) +-endif() diff --git a/dev-libs/tut/metadata.xml b/dev-libs/oneCCL/metadata.xml index 026cdb22b..cbb320b12 100644 --- a/dev-libs/tut/metadata.xml +++ b/dev-libs/oneCCL/metadata.xml @@ -1,8 +1,11 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> </maintainer> + <upstream> + <remote-id type="github">oneapi-src/oneCCL</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/oneCCL/oneCCL-2021.10.ebuild b/dev-libs/oneCCL/oneCCL-2021.10.ebuild new file mode 100644 index 000000000..a67659f4a --- /dev/null +++ b/dev-libs/oneCCL/oneCCL-2021.10.ebuild @@ -0,0 +1,62 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="oneAPI Collective Communications Library" +HOMEPAGE="https://github.com/oneapi-src/oneCCL" +SRC_URI="https://github.com/oneapi-src/oneCCL/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="mpi" + +BDEPEND="sys-devel/DPC++" + +DEPEND=" + dev-libs/level-zero:= + sys-apps/hwloc:= + sys-block/libfabric:= + sys-devel/ittapi + sys-cluster/pmix + mpi? ( virtual/mpi ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2021.8-use-system-libs.patch" +) + +src_prepare() { + # No -Werror + find . -name "CMakeLists.txt" -exec sed -i "s/-Werror//g" {} + || die + + # Use system libs instead + rm -r deps/* || die + + # DPC++ compiler required for full functionality + export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang" + export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + # BUILD_CONFIG causes sandbox violation + -DBUILD_CONFIG=OFF + -DCCL_ENABLE_ZE=ON + # TODO: Find out how to execute the tests + -DBUILD_FT=OFF + -DENABLE_MPI_TESTS=OFF + -DENABLE_MPI="$(usex mpi)" + # Use system fabric + -DLIBFABRIC_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} diff --git a/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild new file mode 100644 index 000000000..76ab29af2 --- /dev/null +++ b/dev-libs/oneCCL/oneCCL-2021.7.1-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="oneAPI Collective Communications Library" +HOMEPAGE="https://github.com/oneapi-src/oneCCL" +SRC_URI="https://github.com/oneapi-src/oneCCL/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="mpi" + +BDEPEND="sys-devel/DPC++" + +DEPEND=" + dev-libs/level-zero:= + sys-apps/hwloc:= + sys-block/libfabric:= + sys-devel/ittapi + mpi? ( virtual/mpi ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2021.7.1-use-system-libs.patch" +) + +src_prepare() { + # No -Werror + find . -name "CMakeLists.txt" -exec sed -i "s/-Werror//g" {} + || die + + # Use system libs instead + rm -r deps/* || die + + # DPC++ compiler required for full functionality + export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang" + export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + # BUILD_CONFIG causes sandbox violation + -DBUILD_CONFIG=OFF + -DCCL_ENABLE_ZE=ON + # TODO: Find out how to execute the tests + -DBUILD_FT=OFF + -DENABLE_MPI_TESTS=OFF + -DENABLE_MPI="$(usex mpi)" + # Use system fabric + -DLIBFABRIC_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} diff --git a/dev-libs/oneCCL/oneCCL-2021.8.ebuild b/dev-libs/oneCCL/oneCCL-2021.8.ebuild new file mode 100644 index 000000000..a67659f4a --- /dev/null +++ b/dev-libs/oneCCL/oneCCL-2021.8.ebuild @@ -0,0 +1,62 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="oneAPI Collective Communications Library" +HOMEPAGE="https://github.com/oneapi-src/oneCCL" +SRC_URI="https://github.com/oneapi-src/oneCCL/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="mpi" + +BDEPEND="sys-devel/DPC++" + +DEPEND=" + dev-libs/level-zero:= + sys-apps/hwloc:= + sys-block/libfabric:= + sys-devel/ittapi + sys-cluster/pmix + mpi? ( virtual/mpi ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2021.8-use-system-libs.patch" +) + +src_prepare() { + # No -Werror + find . -name "CMakeLists.txt" -exec sed -i "s/-Werror//g" {} + || die + + # Use system libs instead + rm -r deps/* || die + + # DPC++ compiler required for full functionality + export CC="${ESYSROOT}/usr/lib/llvm/intel/bin/clang" + export CXX="${ESYSROOT}/usr/lib/llvm/intel/bin/clang++" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=OFF + # BUILD_CONFIG causes sandbox violation + -DBUILD_CONFIG=OFF + -DCCL_ENABLE_ZE=ON + # TODO: Find out how to execute the tests + -DBUILD_FT=OFF + -DENABLE_MPI_TESTS=OFF + -DENABLE_MPI="$(usex mpi)" + # Use system fabric + -DLIBFABRIC_DIR="${ESYSROOT}/usr" + ) + cmake_src_configure +} diff --git a/dev-libs/optix/Manifest b/dev-libs/optix/Manifest deleted file mode 100644 index 11e08c79f..000000000 --- a/dev-libs/optix/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST NVIDIA-OptiX-SDK-6.0.0-linux64-25650775.sh 642319364 BLAKE2B 5dc6e23d606ca9f947aff046d20592729e562c66c475d47aa0cda8d3e7361cabbe102b5b0e125744d27e25321d4ac8486a55bc145c54c96c719de6e821744ba9 SHA512 33fbb312c47174a9ddb26bd4b1a1e5089b70eaebdecd80561c91c1926fba2fb8c94ec39b4c2dc8f0ccbb5e27bbd38ad8fb08df1d605ed1ec5b3fd34ecca908b7 -DIST NVIDIA-OptiX-SDK-7.0.0-linux64.sh 28930132 BLAKE2B ae09bc862ccd39c25d5cc103d97b5587e21638079905e5811528b3d59deb7fd546034f24f73696c212274c0613f5b1dca7508bff696f5fec535dda7351166d7e SHA512 349baf367af7890afac87a879c8f7360cc9c93e984cf234216062af0a3cedce8fc6f3fd74240897d4b3854622ce1976a78433cbeadf6fa89c8e84d24e26eef89 -DIST NVIDIA-OptiX-SDK-7.1.0-linux64-x86_64.sh 45564234 BLAKE2B 374bdbe5045ff36b71da8200ad29189cc3afba9783a38a74515caafeb90176eec5bf7a7d5e2045e47c399aa226a61fd12e6e7dd6c034b8a0f260a5850f775e47 SHA512 808a45e2007d8081de21fe15cad4577ba9fe10fc3612486b1230e03b7f17de91902dc773d1f3fef2b89398f230448d9522a03e19d4e6fa12aa4ffd78f1a4f9dc -DIST NVIDIA-OptiX-SDK-7.2.0-linux64-x86_64.sh 44573802 BLAKE2B 546f2f02336d7487e2aab3f348290aaf9bdac153a3fe161b48ad8a897f5d14f6126e06d3b8b4c301f8a6df5735d951dcf544795b2668bc42116bd909e032b18d SHA512 c37f36e2c0d5dbf151a03513e9dc82c21c46f1a88b123153647f44f4305367d1021e522236dda97ab9c641db006242507ae323d668cf2186cf04a83a54b5707f diff --git a/dev-libs/optix/metadata.xml b/dev-libs/optix/metadata.xml deleted file mode 100644 index 43be4e4e4..000000000 --- a/dev-libs/optix/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>heroxbd@gentoo.org</email> - </maintainer> - <maintainer type="person"> - <email>rich@warfaresdl.com</email> - </maintainer> -</pkgmetadata> diff --git a/dev-libs/optix/optix-6.0.0.ebuild b/dev-libs/optix/optix-6.0.0.ebuild deleted file mode 100644 index d0cb4c078..000000000 --- a/dev-libs/optix/optix-6.0.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake cuda - -DESCRIPTION="NVIDIA Ray Tracing Engine" -HOMEPAGE="https://developer.nvidia.com/optix" -SRC_URI="NVIDIA-OptiX-SDK-${PV}-linux64-25650775.sh" - -SLOT="0/6" -KEYWORDS="~amd64" -RESTRICT="fetch" -LICENSE="NVIDIA-r2" - -RDEPEND="dev-util/nvidia-cuda-toolkit - virtual/opengl - media-libs/freeglut" -DEPEND="${RDEPEND}" - -S="${WORKDIR}" - -CMAKE_USE_DIR=${S}/SDK - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from:" - einfo " ${HOMEPAGE}" - einfo "and move it to your DISTDIR directory." - einfo 'DISTDIR value is available from `emerge --info`' -} - -src_unpack() { - tail -n +218 "${DISTDIR}"/${A} | tar -zx || die -} - -src_prepare() { - cmake_src_prepare - rm -rf SDK-precompiled-samples - export PATH=$(cuda_gccdir):${PATH} -} - -src_install() { - insinto /opt/${PN} - doins -r doc include lib64 -} diff --git a/dev-libs/optix/optix-7.0.0.ebuild b/dev-libs/optix/optix-7.0.0.ebuild deleted file mode 100644 index c419a9cee..000000000 --- a/dev-libs/optix/optix-7.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="NVIDIA Ray Tracing Engine" -HOMEPAGE="https://developer.nvidia.com/optix" -SRC_URI="NVIDIA-OptiX-SDK-${PV}-linux64.sh" - -SLOT="0/7" -KEYWORDS="~amd64" -RESTRICT="fetch" -LICENSE="NVIDIA-r2" - -RDEPEND=" - dev-util/nvidia-cuda-toolkit - media-libs/freeglut - virtual/opengl -" -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from:" - einfo " ${HOMEPAGE}" - einfo "and move it to your DISTDIR directory." - einfo 'DISTDIR value is available from `emerge --info`' -} - -src_unpack() { - tail -n +223 "${DISTDIR}"/${A} | tar -zx || die -} - -src_install() { - insinto /opt/${PN} - dodoc -r doc - doins -r include SDK -} diff --git a/dev-libs/optix/optix-7.1.0.ebuild b/dev-libs/optix/optix-7.1.0.ebuild deleted file mode 100644 index afeda2b32..000000000 --- a/dev-libs/optix/optix-7.1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="NVIDIA Ray Tracing Engine" -HOMEPAGE="https://developer.nvidia.com/optix" -SRC_URI="NVIDIA-OptiX-SDK-${PV}-linux64-x86_64.sh" - -SLOT="0/7" -KEYWORDS="~amd64" -RESTRICT="fetch" -LICENSE="NVIDIA-r2" - -RDEPEND=" - dev-util/nvidia-cuda-toolkit - media-libs/freeglut - virtual/opengl -" -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from:" - einfo " ${HOMEPAGE}" - einfo "and move it to your DISTDIR directory." - einfo 'DISTDIR value is available from `emerge --info`' -} - -src_unpack() { - tail -n +223 "${DISTDIR}"/${A} | tar -zx || die -} - -src_install() { - insinto /opt/${PN} - dodoc -r doc - doins -r include SDK -} diff --git a/dev-libs/optix/optix-7.2.0.ebuild b/dev-libs/optix/optix-7.2.0.ebuild deleted file mode 100644 index 34dcf66c4..000000000 --- a/dev-libs/optix/optix-7.2.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="NVIDIA Ray Tracing Engine" -HOMEPAGE="https://developer.nvidia.com/optix" -SRC_URI="NVIDIA-OptiX-SDK-${PV}-linux64-x86_64.sh" -S="${WORKDIR}" - -SLOT="0/7" -KEYWORDS="~amd64" -RESTRICT="fetch mirror" -LICENSE="NVIDIA-r2" - -RDEPEND=" - dev-util/nvidia-cuda-toolkit:= - media-libs/freeglut - virtual/opengl -" - -pkg_nofetch() { - einfo "Please download ${SRC_URI} from:" - einfo " ${HOMEPAGE}" - einfo "and move it to your DISTDIR directory." - einfo 'DISTDIR value is available from `emerge --info`' -} - -src_unpack() { - tail -n +223 "${DISTDIR}"/${A} | tar -zx || die -} - -src_install() { - insinto /opt/${PN} - dodoc -r doc - doins -r include SDK -} diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest deleted file mode 100644 index 81632cac5..000000000 --- a/dev-libs/protobuf/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261 diff --git a/dev-libs/protobuf/files/proto.vim b/dev-libs/protobuf/files/proto.vim deleted file mode 100644 index 6d26809ef..000000000 --- a/dev-libs/protobuf/files/proto.vim +++ /dev/null @@ -1 +0,0 @@ -au BufRead,BufNewFile *.proto set filetype=proto diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch b/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch deleted file mode 100644 index ec043e386..000000000 --- a/dev-libs/protobuf/files/protobuf-3.11.0-disable_no-warning-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -Disable no-warning-test which is compiled with -Werror option and whose only purpose is checking if compilation results in any warnings. - ---- /src/Makefile.am -+++ /src/Makefile.am -@@ -714,7 +714,7 @@ - GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock - check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ -- no-warning-test $(GZCHECKPROGRAMS) -+ $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ - $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ - $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -@@ -901,4 +901,4 @@ - - TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \ - google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS) \ -- protobuf-lite-arena-test no-warning-test -+ protobuf-lite-arena-test diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch b/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch deleted file mode 100644 index 0e22b34ef..000000000 --- a/dev-libs/protobuf/files/protobuf-3.11.0-protoc_input_output_files.patch +++ /dev/null @@ -1,262 +0,0 @@ -https://github.com/protocolbuffers/protobuf/pull/235 - ---- /src/google/protobuf/compiler/command_line_interface.cc -+++ /src/google/protobuf/compiler/command_line_interface.cc -@@ -938,6 +938,28 @@ - } - - if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { -+ bool success = false; -+ int in_fd = STDIN_FILENO; -+ int out_fd = STDOUT_FILENO; -+ -+ if (!protobuf_in_path_.empty()) { -+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); -+ if (in_fd == -1) { -+ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl; -+ return 1; -+ } -+ } -+ if (!protobuf_out_path_.empty()) { -+ out_fd = open(protobuf_out_path_.c_str(), -+ O_WRONLY | O_CREAT | O_TRUNC, -+ 0644); -+ if (out_fd == -1) { -+ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl; -+ close(in_fd); -+ return 1; -+ } -+ } -+ - if (codec_type_.empty()) { - // HACK: Define an EmptyMessage type to use for decoding. - DescriptorPool pool; -@@ -946,13 +968,20 @@ - file.add_message_type()->set_name("EmptyMessage"); - GOOGLE_CHECK(pool.BuildFile(file) != NULL); - codec_type_ = "EmptyMessage"; -- if (!EncodeOrDecode(&pool)) { -- return 1; -- } -+ success = EncodeOrDecode(&pool, in_fd, out_fd); - } else { -- if (!EncodeOrDecode(descriptor_pool.get())) { -- return 1; -- } -+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd); -+ } -+ -+ if (in_fd != STDIN_FILENO) { -+ close(in_fd); -+ } -+ if (out_fd != STDOUT_FILENO) { -+ close(out_fd); -+ } -+ -+ if (!success) { -+ return 1; - } - } - -@@ -990,6 +1019,11 @@ - for (int i = 0; i < proto_path_.size(); i++) { - source_tree->MapPath(proto_path_[i].first, proto_path_[i].second); - } -+ if (mode_ == MODE_COMPILE && -+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { -+ std::cerr << "--protobuf_in and --protobuf_out are only valid with " -+ << "decode operations. Ignoring."; -+ } - - // Map input files to virtual paths if possible. - if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) { -@@ -1650,6 +1684,12 @@ - - codec_type_ = value; - -+ } else if (name == "--protobuf_in") { -+ protobuf_in_path_ = value; -+ -+ } else if (name == "--protobuf_out") { -+ protobuf_out_path_ = value; -+ - } else if (name == "--error_format") { - if (value == "gcc") { - error_format_ = ERROR_FORMAT_GCC; -@@ -1786,29 +1826,50 @@ - " -h, --help Show this text and exit.\n" - " --encode=MESSAGE_TYPE Read a text-format message of the " - "given type\n" -- " from standard input and write it in " -- "binary\n" -- " to standard output. The message type " -- "must\n" -+ " and write it in binary. The message " -+ "type must\n" - " be defined in PROTO_FILES or their " - "imports.\n" -+ " The input/output protobuf files are " -+ "specified\n" -+ " using the --protobuf_in and " -+ "--protobuf_out\n" -+ " command line flags.\n" - " --decode=MESSAGE_TYPE Read a binary message of the given " -- "type from\n" -- " standard input and write it in text " -- "format\n" -- " to standard output. The message type " -- "must\n" -- " be defined in PROTO_FILES or their " -- "imports.\n" -+ "type and\n" -+ " write it in text format. The message " -+ "type\n" -+ " must be defined in PROTO_FILES or " -+ "their imports.\n" -+ " The input/output protobuf files are " -+ "specified\n" -+ " using the --protobuf_in and " -+ "--protobuf_out\n" -+ " command line flags.\n" - " --decode_raw Read an arbitrary protocol message " -- "from\n" -- " standard input and write the raw " -- "tag/value\n" -- " pairs in text format to standard " -- "output. No\n" -+ "and write\n" -+ " the raw tag/value pairs in text format." -+ " No\n" - " PROTO_FILES should be given when using " - "this\n" -- " flag.\n" -+ " flag. The input/output protobuf files " -+ "are\n" -+ " specified using the --protobuf_in and\n" -+ " --protobuf_out command line flags.\n" -+ " --protobuf_in=FILE Absolute path to the protobuf file " -+ "from which\n" -+ " input of encoding/decoding operation " -+ "will be\n" -+ " read. If omitted, input will be read " -+ "from\n" -+ " standard input.\n" -+ " --protobuf_out=FILE Absolute path to the protobuf file " -+ "to which\n" -+ " output of encoding/decoding operation " -+ "will be\n" -+ " written. If omitted, output will be " -+ "written to\n" -+ " standard output.\n" - " --descriptor_set_in=FILES Specifies a delimited list of FILES\n" - " each containing a FileDescriptorSet " - "(a\n" -@@ -2123,7 +2184,9 @@ - return true; - } - --bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { -+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd) { - // Look up the type. - const Descriptor* type = pool->FindMessageTypeByName(codec_type_); - if (type == NULL) { -@@ -2135,15 +2198,15 @@ - std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); - - if (mode_ == MODE_ENCODE) { -- SetFdToTextMode(STDIN_FILENO); -- SetFdToBinaryMode(STDOUT_FILENO); -+ SetFdToTextMode(in_fd); -+ SetFdToBinaryMode(out_fd); - } else { -- SetFdToBinaryMode(STDIN_FILENO); -- SetFdToTextMode(STDOUT_FILENO); -+ SetFdToBinaryMode(in_fd); -+ SetFdToTextMode(out_fd); - } - -- io::FileInputStream in(STDIN_FILENO); -- io::FileOutputStream out(STDOUT_FILENO); -+ io::FileInputStream in(in_fd); -+ io::FileOutputStream out(out_fd); - - if (mode_ == MODE_ENCODE) { - // Input is text. ---- /src/google/protobuf/compiler/command_line_interface.h -+++ /src/google/protobuf/compiler/command_line_interface.h -@@ -288,7 +288,9 @@ - GeneratorContext* generator_context, std::string* error); - - // Implements --encode and --decode. -- bool EncodeOrDecode(const DescriptorPool* pool); -+ bool EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd); - - // Implements the --descriptor_set_out option. - bool WriteDescriptorSet( -@@ -420,6 +422,13 @@ - // parsed FileDescriptorSets to be used for loading protos. Otherwise, empty. - std::vector<std::string> descriptor_set_in_names_; - -+ // When using --encode / --decode / --decode_raw absolute path to the output -+ // file. (Empty string indicates write to STDOUT). -+ std::string protobuf_out_path_; -+ // When using --encode / --decode / --decode_raw, absolute path to the input -+ // file. (Empty string indicates read from STDIN). -+ std::string protobuf_in_path_; -+ - // If --descriptor_set_out was given, this is the filename to which the - // FileDescriptorSet should be written. Otherwise, empty. - std::string descriptor_set_out_name_; ---- /src/google/protobuf/compiler/command_line_interface_unittest.cc -+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc -@@ -95,7 +95,7 @@ - virtual void SetUp(); - virtual void TearDown(); - -- // Runs the CommandLineInterface with the given command line. The -+ // Run the CommandLineInterface with the given command line. The - // command is automatically split on spaces, and the string "$tmpdir" - // is replaced with TestTempDir(). - void Run(const std::string& command); -@@ -2491,6 +2491,17 @@ - std::string::npos); - } - -+ void ExpectBinaryFilesMatch(const string &expected_file, -+ const string &actual_file) { -+ string expected_output, actual_output; -+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); -+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); -+ -+ // Don't use EXPECT_EQ because we don't want to print raw binary data to -+ // stdout on failure. -+ EXPECT_TRUE(expected_output == actual_output); -+ } -+ - private: - void WriteUnittestProtoDescriptorSet() { - unittest_proto_descriptor_set_filename_ = -@@ -2585,6 +2596,19 @@ - "net/proto2/internal/no_such_file.proto: No such file or directory\n"); - } - -+TEST_P(EncodeDecodeTest, RedirectInputOutput) { -+ string out_file = TestTempDir() + "/golden_message_out.pbf"; -+ EXPECT_TRUE( -+ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") + -+ " --encode=protobuf_unittest.TestAllTypes" + -+ " --protobuf_in=" + TestUtil::GetTestDataPath( -+ "net/proto2/internal/" -+ "testdata/text_format_unittest_data_oneof_implemented.txt") + -+ " --protobuf_out=" + out_file)); -+ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath( -+ "net/proto2/internal/testdata/golden_message_oneof_implemented")); -+} -+ - INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest, - testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN)); - } // anonymous namespace diff --git a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch b/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch deleted file mode 100644 index 8311ce8b2..000000000 --- a/dev-libs/protobuf/files/protobuf-3.11.0-system_libraries.patch +++ /dev/null @@ -1,121 +0,0 @@ ---- /Makefile.am -+++ /Makefile.am -@@ -11,28 +11,10 @@ - # Always include third_party directories in distributions. - DIST_SUBDIRS = src conformance benchmarks third_party/googletest - --# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS --# because then "make check" would also build and run all of gmock's own tests, --# which takes a lot of time and is generally not useful to us. Also, we don't --# want "make install" to recurse into gmock since we don't want to overwrite --# the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la - --# We would like to clean gmock when "make clean" is invoked. But we have to --# be careful because clean-local is also invoked during "make distclean", but --# "make distclean" already recurses into gmock because it's listed among the --# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to --# cd to the directory again and "make clean" it will fail. So, check that the --# Makefile exists before recursing. - clean-local: -- @if test -e third_party/googletest/Makefile; then \ -- echo "Making clean in googletest"; \ -- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \ -- fi; \ -- if test -e conformance/Makefile; then \ -+ @if test -e conformance/Makefile; then \ - echo "Making clean in conformance"; \ - cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \ - fi; \ ---- /configure.ac -+++ /configure.ac -@@ -223,12 +223,5 @@ - esac - AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1]) - --# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, --# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock --# too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([third_party/googletest]) -- - AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT ---- /src/Makefile.am -+++ /src/Makefile.am -@@ -708,19 +708,11 @@ - google/protobuf/testing/file.cc \ - google/protobuf/testing/file.h - --GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest --GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock --GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest --GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock - check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \ -- -I$(GOOGLEMOCK_SRC_DIR)/include -+ -lgtest -lgmock -lgmock_main - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -812,12 +804,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ -- -I$(GOOGLETEST_SRC_DIR)/include \ -- -DPROTOBUF_TEST_NO_DESCRIPTORS -+ -lgtest -lgmock -lgmock_main -+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ - google/protobuf/compiler/cpp/cpp_unittest.cc \ -@@ -838,11 +826,7 @@ - # full runtime and we want to make sure this test builds without full - # runtime. - protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \ -- -I$(GOOGLETEST_SRC_DIR)/include -+ -lgtest -lgmock -lgmock_main - protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_test_SOURCES = \ - google/protobuf/lite_unittest.cc \ -@@ -854,11 +838,7 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \ -- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \ -- -I$(GOOGLETEST_SRC_DIR)/include -+ -lgtest -lgmock -lgmock_main - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -868,8 +848,7 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include -+ -lgtest - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml deleted file mode 100644 index 0d125ed97..000000000 --- a/dev-libs/protobuf/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci@gentoo.org</email> - <description>Gentoo Science Project</description> - </maintainer> -</pkgmetadata> diff --git a/dev-libs/protobuf/protobuf-3.11.4.ebuild b/dev-libs/protobuf/protobuf-3.11.4.ebuild deleted file mode 100644 index 8e2342b29..000000000 --- a/dev-libs/protobuf/protobuf-3.11.4.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 2008-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs - -DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data" -HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" -SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/22" -KEYWORDS="~amd64" -IUSE="emacs examples static-libs test zlib" -RESTRICT="!test? ( test )" - -BDEPEND="emacs? ( app-editors/emacs:* )" -DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" -RDEPEND="emacs? ( app-editors/emacs:* ) - zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-3.11.0-disable_no-warning-test.patch" - "${FILESDIR}/${PN}-3.11.0-system_libraries.patch" - "${FILESDIR}/${PN}-3.11.0-protoc_input_output_files.patch" -) - -DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md) - -src_prepare() { - default - - # https://github.com/protocolbuffers/protobuf/issues/7413 - sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die - - eautoreconf -} - -src_configure() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - - if tc-ld-is-gold; then - # https://sourceware.org/bugzilla/show_bug.cgi?id=24527 - tc-ld-disable-gold - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local options=( - $(use_enable static-libs static) - $(use_with zlib) - ) - - if tc-is-cross-compiler; then - # Build system uses protoc when building, so protoc copy runnable on host is needed. - mkdir -p "${WORKDIR}/build" || die - pushd "${WORKDIR}/build" > /dev/null || die - ECONF_SOURCE="${S}" econf_build "${options[@]}" - options+=(--with-protoc="$(pwd)/src/protoc") - popd > /dev/null || die - fi - - ECONF_SOURCE="${S}" econf "${options[@]}" -} - -src_compile() { - multilib-minimal_src_compile - - if use emacs; then - elisp-compile editors/protobuf-mode.el - fi -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}/build/src" protoc - fi - - default -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - find "${D}" -name "*.la" -type f -delete || die - - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/proto.vim" - - if use emacs; then - elisp-install ${PN} editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=(examples) - docompress -x /usr/share/doc/${PF}/examples - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-libs/simclist/metadata.xml b/dev-libs/simclist/metadata.xml index 8426fdb21..62c13e1e4 100644 --- a/dev-libs/simclist/metadata.xml +++ b/dev-libs/simclist/metadata.xml @@ -15,4 +15,7 @@ <flag name="dump">Disable building of dump and restore functionalities</flag> <flag name="hash">Allow list_hash() to work exclusively on memory locations</flag> </use> + <upstream> + <remote-id type="github">mij/simclist</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-libs/simclist/simclist-1.6_p1.ebuild b/dev-libs/simclist/simclist-1.6_p1.ebuild index 2b7eb84f1..41c9151c5 100644 --- a/dev-libs/simclist/simclist-1.6_p1.ebuild +++ b/dev-libs/simclist/simclist-1.6_p1.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc dump hash threads" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND="doc? ( app-text/doxygen )" CMAKE_IN_SOURCE_BUILD=1 diff --git a/dev-libs/tut/Manifest b/dev-libs/tut/Manifest deleted file mode 100644 index 30c2a9334..000000000 --- a/dev-libs/tut/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST tut-0_p20200320.tar.gz 262793 BLAKE2B fb8d16a7ca099dda88d300fb2521affb59fc7c84d52ba3a278cbd573621f1b922a3330097bd756844841582d6d0b5d76d8c90529e6f18a3020cd4ae0655e4591 SHA512 54b34519c90d8ab5e8264572c43245122d8c0f9d41a8acf86ad29f2cd4f35bf481b00f3aaedd922febd79b6da148fd90bb9d1521a148e7a7d6d01204805df1fb diff --git a/dev-libs/tut/tut-0_p20200320.ebuild b/dev-libs/tut/tut-0_p20200320.ebuild deleted file mode 100644 index f4f13064e..000000000 --- a/dev-libs/tut/tut-0_p20200320.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOCS_BUILDER="doxygen" -DOCS_DIR="doc/webgen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit docs - -COMMIT="a8e49ef56dc8be5256b5305ec6702d50c5b36c09" - -DESCRIPTION="C++ Template Unit Test Framework" -HOMEPAGE="https://mrzechonek.github.io/tut-framework/" -SRC_URI="https://github.com/mrzechonek/tut-framework/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="examples" - -S="${WORKDIR}/${PN}-framework-${COMMIT}" - -BDEPEND="dev-util/waf" - -src_configure() { - waf configure || die "waf configure failed" -} - -src_compile() { - waf build || die "waf compile failed" - docs_compile -} - -src_install() { - default - # install function does not work for some reason - #waf install || die "waf install failed" - cp -r build/* . || die - - doheader -r include/* - - if use examples ; then - dodoc -r example - fi -} |