From 482a48c0e1675b1e92663b8b5222bb7261aa7956 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jul 2024 12:26:41 +0100 Subject: gentoo auto-resync : 13:07:2024 - 12:26:41 --- sys-cluster/hpx/Manifest | 8 +- sys-cluster/hpx/files/hpx-1.10.0-python.patch | 30 ++++++++ sys-cluster/hpx/files/hpx-1.8.0-python.patch | 30 -------- sys-cluster/hpx/hpx-1.10.0.ebuild | 105 ++++++++++++++++++++++++++ sys-cluster/hpx/hpx-1.9.1.ebuild | 105 -------------------------- sys-cluster/hpx/hpx-9999.ebuild | 6 +- 6 files changed, 142 insertions(+), 142 deletions(-) create mode 100644 sys-cluster/hpx/files/hpx-1.10.0-python.patch delete mode 100644 sys-cluster/hpx/files/hpx-1.8.0-python.patch create mode 100644 sys-cluster/hpx/hpx-1.10.0.ebuild delete mode 100644 sys-cluster/hpx/hpx-1.9.1.ebuild (limited to 'sys-cluster/hpx') diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest index 4ee9e9512c2a..b479bad2583a 100644 --- a/sys-cluster/hpx/Manifest +++ b/sys-cluster/hpx/Manifest @@ -1,5 +1,5 @@ -AUX hpx-1.8.0-python.patch 873 BLAKE2B 825d41a28c2e97633d9dfbdb5efd2d2a2d92f7a064c92d709391f672dae7e01b14de8e60b9aed3b6dd72ec07f17ebd78831e35b76c3e57808d58c3d4cf1ffe11 SHA512 ce200541f91642a44a2d5c019e822fe2bc358bf6d9e362b75d2713c651a01aed07a6c46e8ca571d49b805c1bcadd6aa7eb39ad0e65e201d18d02c9884683818b -DIST hpx-1.9.1.tar.gz 5662661 BLAKE2B 81631333b8899a7271e8c6edf587d0a3afadde28f2605ac4f8ff6ddc3fa5afb5ad8d05818ae6d0bfa8fb7241d3aebfe5f838b85b77f54327010308b22b4900b7 SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090 -EBUILD hpx-1.9.1.ebuild 2291 BLAKE2B 0e618f6fdb308de630c961fe061fe6a8a80a69bed6170893cf0f3b2732d69332dcc699fa2bea02c0b544a6dc5c96c28e640150970b9e648af6b9e1091809a01f SHA512 b1cb8a9bfca4768c565526fdd211362277f5451847d507d2b1ae90a44f97b499c476dd28d5081c5251740b000a712fab28e3193386c6caaf6ad6e1ed5a9fb1fb -EBUILD hpx-9999.ebuild 2238 BLAKE2B 805728e5f209cbe5ca498beacc1f49408ac197566fa2b9b1803372a27e6eec8c50e05f72992a523c20aaaeb19af2864f990fc1c70535998f610305fa61149311 SHA512 5f8e3b57aebc071341f8252c8418c5de0e83335c47bba5fb11a381dd7d4d69137f639492a8426027a0019b9e1380e52b38ee035fee90a4b47ccfc7e9d16d6e0d +AUX hpx-1.10.0-python.patch 873 BLAKE2B b1f22f4a1d37a3eea6fe5adf2e6195d49f176fd60cedcf34dfe121fdbc00e147f890984c37a4e94c5efb6f858dcfbf49e2cfee97a8e150acd9b92e15d61a04ff SHA512 59aec0264c75347c4d750b723c80b291439b3fc7cba18e4e8db0131a9636e7541e97884ff0e840650172e47622f144c7cc9928a9e98785e0a6b46bfa4a31fd0a +DIST hpx-1.10.0.tar.gz 6146815 BLAKE2B eeab350944e5a7e68a0bbf2a7bac22c6d739359113ed75d5ed2ff601887c9466c6f92b80823be140e02e1a47480323b69a5f193f13b415f505ccae02792f6e1c SHA512 e1cc9fa72cba4e66b5d6eff2487e93d5d553c32e6eebcfe9131bf69c5b595ab72295ff0986c81d5dc6a7caa8303d6709df91333f64efe59ee256d99a8c289dc5 +EBUILD hpx-1.10.0.ebuild 2284 BLAKE2B 5108aa64028e8dd47cd90b461ac61e286cd254db70d96c3c4c905e2cbd6e326deef0dce0bf4e1b2d27e98154ab934d8710e6f6d5a7a8ff576a9ec92e000878f5 SHA512 25a5c3046e973f566d155db1521a5e45e83aee68b615ace54e58e3f012a8a2faa5467a95ab2d28bbc2e866f8a186ecb51f3ead246de61e8003cb78ab29116447 +EBUILD hpx-9999.ebuild 2238 BLAKE2B 815fe18ef1fdfc56eedc84b111bcdf9814281e8f670fcfa890fbc50a3cd815cdad9d437111effef74ce7ff079f190815a21e447a99127487b82639b9d6a2c663 SHA512 bb2f43d995d3fed74b40af12aea7536345845b91b782e7e816a611a607d36ff0784b1b81cf8efb2f12da4ee98d930428b667b98b87272f425e48e1d1e0216185 MISC metadata.xml 1220 BLAKE2B a5837e65f59f895e5680cdcb7e82d6ef775d36300e86bd3b180f223ef4516278a9af17f361e2e55c10b42544c134cc1b7d677d46d20d0e400169fcb4b863d22d SHA512 62ff93d5e85b160d042e55c16a1755937dc85e93ab7c25b96d4ae90da099582e1b7a741d3588e8446fe45c354f0d9b8f7589cebcf999b07a64906d71c79474a3 diff --git a/sys-cluster/hpx/files/hpx-1.10.0-python.patch b/sys-cluster/hpx/files/hpx-1.10.0-python.patch new file mode 100644 index 000000000000..573529e76588 --- /dev/null +++ b/sys-cluster/hpx/files/hpx-1.10.0-python.patch @@ -0,0 +1,30 @@ +From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001 +From: Kurt Kanzenbach +Date: Tue, 17 Mar 2020 16:20:35 +0100 +Subject: [PATCH 1/4] cmake: python: Use standard python interpreter + +These scripts are needed during build and run time. So, use a python interpreter +which works for both cases. + +Signed-off-by: Kurt Kanzenbach +--- + cmake/templates/hpxcxx.in | 2 +- + cmake/templates/hpxrun.py.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/cmake/templates/hpxcxx.in ++++ b/cmake/templates/hpxcxx.in +@@ -1,4 +1,4 @@ +-#! @Python_EXECUTABLE@ ++#! /usr/bin/env python + # + # Copyright (c) 2014 Steven R. Brandt + # +--- a/cmake/templates/hpxrun.py.in ++++ b/cmake/templates/hpxrun.py.in +@@ -1,4 +1,4 @@ +-#! @Python_EXECUTABLE@ ++#! /usr/bin/env python + # + # Copyright (c) 2014 Thomas Heller + # diff --git a/sys-cluster/hpx/files/hpx-1.8.0-python.patch b/sys-cluster/hpx/files/hpx-1.8.0-python.patch deleted file mode 100644 index 21b7ce3ceeff..000000000000 --- a/sys-cluster/hpx/files/hpx-1.8.0-python.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001 -From: Kurt Kanzenbach -Date: Tue, 17 Mar 2020 16:20:35 +0100 -Subject: [PATCH 1/4] cmake: python: Use standard python interpreter - -These scripts are needed during build and run time. So, use a python interpreter -which works for both cases. - -Signed-off-by: Kurt Kanzenbach ---- - cmake/templates/hpxcxx.in | 2 +- - cmake/templates/hpxrun.py.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/cmake/templates/hpxcxx.in -+++ b/cmake/templates/hpxcxx.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Steven R. Brandt - # ---- a/cmake/templates/hpxrun.py.in -+++ b/cmake/templates/hpxrun.py.in -@@ -1,4 +1,4 @@ --#! @PYTHON_EXECUTABLE@ -+#! /usr/bin/env python - # - # Copyright (c) 2014 Thomas Heller - # diff --git a/sys-cluster/hpx/hpx-1.10.0.ebuild b/sys-cluster/hpx/hpx-1.10.0.ebuild new file mode 100644 index 000000000000..6adc37ae73d9 --- /dev/null +++ b/sys-cluster/hpx/hpx-1.10.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" +else + SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +fi +inherit check-reqs cmake multiprocessing python-single-r1 + +DESCRIPTION="C++ runtime system for parallel and distributed applications" +HOMEPAGE="https://hpx.stellar-group.org/" + +LICENSE="Boost-1.0" +SLOT="0" +IUSE="examples jemalloc mpi papi +perftools tbb zlib" +# tests fail to compile +RESTRICT="test" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ?? ( jemalloc perftools tbb ) +" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + ${PYTHON_DEPS} + >=dev-cpp/asio-1.12.0 + dev-libs/boost:= + sys-apps/hwloc:= + jemalloc? ( dev-libs/jemalloc:= ) + mpi? ( virtual/mpi ) + papi? ( dev-libs/papi ) + perftools? ( dev-util/google-perftools:= ) + tbb? ( dev-cpp/tbb:= ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-python.patch" +) + +hpx_memory_requirement() { + # HPX needs enough main memory for compiling + # rule of thumb: 1G per job + if [[ -z ${MAKEOPTS} ]] ; then + echo "2G" + else + local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") + echo "${jobs}G" + fi +} + +pkg_pretend() { + local CHECKREQS_MEMORY=$(hpx_memory_requirement) + check-reqs_pkg_setup +} + +pkg_setup() { + local CHECKREQS_MEMORY=$(hpx_memory_requirement) + check-reqs_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DHPX_WITH_EXAMPLES=OFF + -DHPX_WITH_DOCUMENTATION=OFF + -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) + -DHPX_WITH_PAPI=$(usex papi) + -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) + -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib) + -DHPX_WITH_TESTS=OFF + ) + if use jemalloc; then + mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) + elif use perftools; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) + elif use tbb; then + mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) + else + mycmakeargs+=( -DHPX_WITH_MALLOC=system ) + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile +} + +src_install() { + cmake_src_install + use examples && dodoc -r examples/ + python_fix_shebang "${ED}" +} diff --git a/sys-cluster/hpx/hpx-1.9.1.ebuild b/sys-cluster/hpx/hpx-1.9.1.ebuild deleted file mode 100644 index 8deb0b7b7817..000000000000 --- a/sys-cluster/hpx/hpx-1.9.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/STEllAR-GROUP/hpx.git" -else - SRC_URI="https://github.com/STEllAR-GROUP/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -fi -inherit check-reqs cmake multiprocessing python-single-r1 - -DESCRIPTION="C++ runtime system for parallel and distributed applications" -HOMEPAGE="https://hpx.stellar-group.org/" - -SLOT="0" -LICENSE="Boost-1.0" -IUSE="examples jemalloc mpi papi +perftools tbb zlib" -# tests fail to compile -RESTRICT="test" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - ?? ( jemalloc perftools tbb ) -" - -BDEPEND=" - virtual/pkgconfig -" -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/asio-1.12.0 - dev-libs/boost:= - sys-apps/hwloc:= - jemalloc? ( dev-libs/jemalloc:= ) - mpi? ( virtual/mpi ) - papi? ( dev-libs/papi ) - perftools? ( dev-util/google-perftools:= ) - tbb? ( dev-cpp/tbb:= ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.8.0-python.patch" -) - -hpx_memory_requirement() { - # HPX needs enough main memory for compiling - # rule of thumb: 1G per job - if [[ -z ${MAKEOPTS} ]] ; then - echo "2G" - else - local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") - echo "${jobs}G" - fi -} - -pkg_pretend() { - local CHECKREQS_MEMORY=$(hpx_memory_requirement) - check-reqs_pkg_setup -} - -pkg_setup() { - local CHECKREQS_MEMORY=$(hpx_memory_requirement) - check-reqs_pkg_setup - python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DHPX_WITH_EXAMPLES=OFF - -DHPX_WITH_DOCUMENTATION=OFF - -DHPX_WITH_PARCELPORT_MPI=$(usex mpi) - -DHPX_WITH_PAPI=$(usex papi) - -DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools) - -DHPX_WITH_COMPRESSION_ZLIB=$(usex zlib) - -DHPX_WITH_TESTS=OFF - ) - if use jemalloc; then - mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc ) - elif use perftools; then - mycmakeargs+=( -DHPX_WITH_MALLOC=tcmalloc ) - elif use tbb; then - mycmakeargs+=( -DHPX_WITH_MALLOC=tbbmalloc ) - else - mycmakeargs+=( -DHPX_WITH_MALLOC=system ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile -} - -src_install() { - cmake_src_install - use examples && dodoc -r examples/ - python_fix_shebang "${ED}" -} diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild index 8bdbcb41d96a..e8ac94549585 100644 --- a/sys-cluster/hpx/hpx-9999.ebuild +++ b/sys-cluster/hpx/hpx-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) if [[ ${PV} == 9999 ]] ; then inherit git-r3 @@ -17,8 +17,8 @@ inherit check-reqs cmake multiprocessing python-single-r1 DESCRIPTION="C++ runtime system for parallel and distributed applications" HOMEPAGE="https://hpx.stellar-group.org/" -SLOT="0" LICENSE="Boost-1.0" +SLOT="0" IUSE="examples jemalloc mpi papi +perftools tbb zlib" # tests fail to compile RESTRICT="test" -- cgit v1.2.3