* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2018-06-25 4:44 Andreas Sturmlechner
0 siblings, 0 replies; 10+ messages in thread
From: Andreas Sturmlechner @ 2018-06-25 4:44 UTC (permalink / raw
To: gentoo-commits
commit: a5d63e17ed7ccbd3f998a6a208b7d27bcaf1d1d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 14:07:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 25 04:43:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d63e17
sys-cluster/hpx: Drop old
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-cluster/hpx/Manifest | 3 -
sys-cluster/hpx/files/hpx-0.9.8-cmake_dir.patch | 27 ----
sys-cluster/hpx/files/hpx-0.9.8-install-path.patch | 69 ---------
sys-cluster/hpx/files/hpx-0.9.8-multilib.patch | 163 ---------------------
sys-cluster/hpx/hpx-0.9.10.ebuild | 77 ----------
sys-cluster/hpx/hpx-0.9.8.ebuild | 85 -----------
sys-cluster/hpx/hpx-0.9.9.ebuild | 79 ----------
7 files changed, 503 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 4179b457d44..573559b5cc0 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,5 +1,2 @@
-DIST hpx-0.9.9.tar.gz 3461235 BLAKE2B 647f838fc1f2d41ed970212eac826eccefce33f4e2bce8f6a8d71530b7b91aa4fc92833d476a4daba10b6301813c7864a1f2b817731a67ac4f860d5dc4065e8f SHA512 95332c924548f7d07e24c56d3d72e8aa5977a1347666fb2a0f3782fec040e83e5760750a1696cf8152d7b3f8b90ce719fe24018086a5165429b3f9851c2f7e1f
-DIST hpx_0.9.10.tar.gz 3016064 BLAKE2B dcf31ec4f7e60660be3301e2d3dbdf6126ccccc62d91e317715b91d633fa400f007aed52358b5aea6bff9c6f5aeb8d2dad629ae1c63170c44e4ebeb9aeff71dd SHA512 4c5ce7014d781c47415818898b99e5379e1547dd5f54fdefc9202de149ca4a0e3bf13c863cdea9ef70f7e3eb2c808cfda35d723a7f681745b8514a1887cbbb75
-DIST hpx_0.9.8.7z 2089649 BLAKE2B 8b6f3dca44492880f9fdc37ee7b530574c4122d047529980c3d519e72bd15ad8342cc8e3b958b7b9c02cafdc6d9f2ff90fca19866e602522011871ac1f5b22da SHA512 1789582ee776173d4aa67b512d2df225c734b98ffe59a8f1eee38b5112ac7c02e0c7c478f72062e5b6a5d5053ce1848729c374093378f63200acf51a208fb3c7
DIST hpx_0.9.99.tar.gz 3779841 BLAKE2B fae6b06a303964e3d52d68fcfd980f89625bfd2a7c04f3a4b027c47814c677bdcf7f367434aee912be08b67afbb6cfe811831dfdc284c0b785d7eaf8838566a9 SHA512 57c03c01c4a9f770e56a60645ec352338365fe05c544b18ff2e944044284315a7e76bbdc2c7193fe55e6992dcb51a51d1042372fdd141b572bd8e18bf1afc363
DIST hpx_1.0.0.tar.gz 3972403 BLAKE2B 737282f2b547c2ce7e6e0367df64beaf22760d73840f2f1b983e8b970baef074b376f264a97f8c67873eedc24255ec2515bbf2a5bbcb364f89284f48ac18b177 SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
diff --git a/sys-cluster/hpx/files/hpx-0.9.8-cmake_dir.patch b/sys-cluster/hpx/files/hpx-0.9.8-cmake_dir.patch
deleted file mode 100644
index b5c66c28475..00000000000
--- a/sys-cluster/hpx/files/hpx-0.9.8-cmake_dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e565c2cce934f2d6fa6e80061c416a2e7df0f311 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@lanl.gov>
-Date: Tue, 20 May 2014 11:18:21 -0600
-Subject: [PATCH] make cmake_dir configure-able
-
----
- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ad79cb..e6f392a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1981,7 +1981,9 @@ endforeach()
- # Make list unique
- list(REMOVE_DUPLICATES external_definitions)
-
--set(cmake_dir cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-+if (NOT DEFINED cmake_dir)
-+ set(cmake_dir cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
-+endif(NOT DEFINED cmake_dir)
-
- if(MSVC)
- set(output_dir "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
---
-1.8.5.5
-
diff --git a/sys-cluster/hpx/files/hpx-0.9.8-install-path.patch b/sys-cluster/hpx/files/hpx-0.9.8-install-path.patch
deleted file mode 100644
index f5c867b9b4a..00000000000
--- a/sys-cluster/hpx/files/hpx-0.9.8-install-path.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 5c04f9c2d47a41f6113f45eeb4dd9f7968f2cd52 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@lanl.gov>
-Date: Tue, 20 May 2014 09:27:47 -0600
-Subject: [PATCH] fix make install non-empty DESTDIR
-
-Symlinks were created even when make install was called with a
-non-empty DESTDIR variable. Fixed by creating the symlinks in build
-directory first and then install them using common install.
-DESTDIR installation is needed for binary packages.
----
- CMakeLists.txt | 31 +++++++++++++++++++------------
- 1 file changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 00a71c7..8d5df19 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1762,15 +1762,22 @@ if(NOT HPX_NO_INSTALL)
-
- if(UNIX)
- file(GLOB scripts "${CMAKE_SOURCE_DIR}/python/scripts/*.py")
-+ execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory
-+ "${CMAKE_BINARY_DIR}/python/scripts" )
- foreach(script ${scripts})
- get_filename_component(script_name ${script} NAME)
- get_filename_component(script_name_we ${script} NAME_WE)
-- install(CODE
-- "set(bindir \"${CMAKE_INSTALL_PREFIX}/bin/\")
-- execute_process(
-- COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink
-- \"${script_name}\" \"${script_name_we}\"
-- WORKING_DIRECTORY \"\${bindir}\")")
-+
-+ #make copy, so that we have intact symlink in CMAKE_BINARY_DIR
-+ execute_process(
-+ COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${script}" "${script_name}"
-+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python/scripts")
-+
-+ execute_process(
-+ COMMAND "${CMAKE_COMMAND}" -E create_symlink "${script_name}" "${script_name_we}"
-+ WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python/scripts")
-+
-+ install(FILES "${CMAKE_BINARY_DIR}/python/scripts/${script_name_we}" DESTINATION "bin")
- endforeach()
- endif()
-
-@@ -1781,13 +1788,13 @@ if(NOT HPX_NO_INSTALL)
- FILES_MATCHING PATTERN "*.py"
- PATTERN ".git" EXCLUDE)
-
-+ execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_BINARY_DIR}/python" )
-+ #make symlink, so that we have intact hpx symlink in CMAKE_BINARY_DIR
-+ execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "${CMAKE_SOURCE_DIR}/python/hpx"
-+ "hpx-${HPX_VERSION}" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python")
- # create a symlink in share pointing to the latest HPX installation
-- install(CODE
-- "set(sharedir \"${CMAKE_INSTALL_PREFIX}/share/\")
-- execute_process(
-- COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink
-- \"hpx-${HPX_VERSION}\" \"hpx\"
-- WORKING_DIRECTORY \"\${sharedir}\")")
-+ execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "hpx-${HPX_VERSION}" "hpx" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/python")
-+ install(DIRECTORY "${CMAKE_BINARY_DIR}/python/hpx" DESTINATION "share")
-
- install( # Install external dependencies
- DIRECTORY external/cache/boost
---
-1.8.5.5
-
diff --git a/sys-cluster/hpx/files/hpx-0.9.8-multilib.patch b/sys-cluster/hpx/files/hpx-0.9.8-multilib.patch
deleted file mode 100644
index 470e76e3b80..00000000000
--- a/sys-cluster/hpx/files/hpx-0.9.8-multilib.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 383acb45e75406fb94bb4fa86c162a78c05ab840 Mon Sep 17 00:00:00 2001
-From: Christoph Junghans <junghans@lanl.gov>
-Date: Tue, 20 May 2014 11:03:16 -0600
-Subject: [PATCH] added LIB cmake option to configure lib directory
-
-for multiarch distributions the lib directory needs to changed
-from 'lib' to 'lib64'/'lib32'. Add an cmake option to do this.
----
- CMakeLists.txt | 11 +++++++----
- cmake/HPX_AddComponent.cmake | 2 +-
- cmake/HPX_AddLibrary.cmake | 2 +-
- plugins/binary_filter/bzip2/CMakeLists.txt | 2 +-
- plugins/binary_filter/snappy/CMakeLists.txt | 2 +-
- plugins/binary_filter/zlib/CMakeLists.txt | 2 +-
- plugins/parcel/coalescing/CMakeLists.txt | 2 +-
- src/CMakeLists.txt | 6 +++---
- 8 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8d5df19..8ad79cb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -192,6 +192,9 @@ else()
- "64" ADVANCED)
- endif()
-
-+if (NOT DEFINED LIB)
-+ set(LIB "lib")
-+endif(NOT DEFINED LIB)
- ###############################################################################
- if(UNIX)
- hpx_link_directories("${CMAKE_BINARY_DIR}/lib/hpx")
-@@ -2027,14 +2030,14 @@
- if(NOT HPX_NO_INSTALL)
- if(NOT ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug"))
- install(FILES ${output_dir}/lib/pkgconfig/hpx_application.pc
-- DESTINATION lib/pkgconfig)
-+ DESTINATION ${LIB}/pkgconfig)
- install(FILES ${output_dir}/lib/pkgconfig/hpx_component.pc
-- DESTINATION lib/pkgconfig)
-+ DESTINATION ${LIB}/pkgconfig)
- else()
- install(FILES ${output_dir}/lib/pkgconfig/hpx_application_debug.pc
-- DESTINATION lib/pkgconfig)
-+ DESTINATION ${LIB}/pkgconfig)
- install(FILES ${output_dir}/lib/pkgconfig/hpx_component_debug.pc
-- DESTINATION lib/pkgconfig)
-+ DESTINATION ${LIB}/pkgconfig)
- endif()
- endif()
-
-diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake
-index afbee24..babca54 100644
---- a/cmake/HPX_AddComponent.cmake
-+++ b/cmake/HPX_AddComponent.cmake
-@@ -258,7 +258,7 @@ macro(add_hpx_component name)
- if(${name}_INSTALL_SUFFIX)
- hpx_library_install("${name}_component" "${${name}_INSTALL_SUFFIX}")
- else()
-- hpx_library_install(${name}_component lib/hpx)
-+ hpx_library_install(${name}_component ${LIB}/hpx)
- endif()
-
- foreach(target ${${name}_INI})
-diff --git a/cmake/HPX_AddLibrary.cmake b/cmake/HPX_AddLibrary.cmake
-index 7f39700..8524a45 100644
---- a/cmake/HPX_AddLibrary.cmake
-+++ b/cmake/HPX_AddLibrary.cmake
-@@ -248,7 +248,7 @@ macro(add_hpx_library name)
- if(${name}_INSTALL_SUFFIX)
- hpx_library_install("${name}_lib" "${${name}_INSTALL_SUFFIX}")
- else()
-- hpx_library_install(${name}_lib lib/hpx)
-+ hpx_library_install(${name}_lib ${LIB}/hpx)
- endif()
- endif()
- endmacro()
-diff --git a/plugins/binary_filter/bzip2/CMakeLists.txt b/plugins/binary_filter/bzip2/CMakeLists.txt
-index 2580164..b2fbf40 100644
---- a/plugins/binary_filter/bzip2/CMakeLists.txt
-+++ b/plugins/binary_filter/bzip2/CMakeLists.txt
-@@ -38,7 +38,7 @@ macro(add_bzip2_module)
- add_hpx_pseudo_dependencies(plugins.compression.bzip2 compress_bzip2_lib)
-
- if(NOT HPX_NO_INSTALL)
-- hpx_library_install(compress_bzip2_lib lib/hpx)
-+ hpx_library_install(compress_bzip2_lib ${LIB}/hpx)
- endif()
- endif()
- endmacro()
-diff --git a/plugins/binary_filter/snappy/CMakeLists.txt b/plugins/binary_filter/snappy/CMakeLists.txt
-index 6a7bbac..47e5966 100644
---- a/plugins/binary_filter/snappy/CMakeLists.txt
-+++ b/plugins/binary_filter/snappy/CMakeLists.txt
-@@ -30,7 +30,7 @@ macro(add_snappy_module)
- add_hpx_pseudo_dependencies(plugins.compression.snappy compress_snappy_lib)
-
- if(NOT HPX_NO_INSTALL)
-- hpx_library_install(compress_snappy_lib lib/hpx)
-+ hpx_library_install(compress_snappy_lib ${LIB}/hpx)
- endif()
- endif()
- endmacro()
-diff --git a/plugins/binary_filter/zlib/CMakeLists.txt b/plugins/binary_filter/zlib/CMakeLists.txt
-index 4a188ca..e4485f7 100644
---- a/plugins/binary_filter/zlib/CMakeLists.txt
-+++ b/plugins/binary_filter/zlib/CMakeLists.txt
-@@ -38,7 +38,7 @@ macro(add_zlib_module)
- add_hpx_pseudo_dependencies(plugins.compression.zlib compress_zlib_lib)
-
- if(NOT HPX_NO_INSTALL)
-- hpx_library_install(compress_zlib_lib lib/hpx)
-+ hpx_library_install(compress_zlib_lib ${LIB}/hpx)
- endif()
- endif()
- endmacro()
-diff --git a/plugins/parcel/coalescing/CMakeLists.txt b/plugins/parcel/coalescing/CMakeLists.txt
-index 093e427..889c10c 100644
---- a/plugins/parcel/coalescing/CMakeLists.txt
-+++ b/plugins/parcel/coalescing/CMakeLists.txt
-@@ -22,7 +22,7 @@ macro(add_coalescing_module)
- add_hpx_pseudo_dependencies(plugins.parcel.coalescing parcel_coalescing_lib)
-
- if(NOT HPX_NO_INSTALL)
-- hpx_library_install(parcel_coalescing_lib lib/hpx)
-+ hpx_library_install(parcel_coalescing_lib ${LIB}/hpx)
- endif()
- endmacro()
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 4f4c79c..6190839 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -312,7 +312,7 @@ set_property(TARGET hpx_serialization APPEND
- "HPX_COROUTINE_EXPORTS")
-
- if(NOT HPX_NO_INSTALL)
-- hpx_library_install(hpx_serialization lib/hpx)
-+ hpx_library_install(hpx_serialization ${LIB}/hpx)
- endif()
-
- ################################################################################
-@@ -403,7 +403,7 @@ set_property(TARGET hpx APPEND
- "HPX_COROUTINE_EXPORTS") # Do we still need this?
-
- if(NOT HPX_NO_INSTALL)
-- hpx_library_install(hpx lib/hpx)
-+ hpx_library_install(hpx ${LIB}/hpx)
- endif()
-
- ################################################################################
-@@ -436,7 +436,7 @@ endif()
- set_property(TARGET hpx_init PROPERTY FOLDER "Core")
-
- if(NOT HPX_NO_INSTALL)
-- hpx_archive_install(hpx_init lib/hpx)
-+ hpx_archive_install(hpx_init ${LIB}/hpx)
- endif()
-
- set(HPX_CONFIG_DEFINITIONS ${HPX_CONFIG_DEFINITIONS} PARENT_SCOPE)
---
-1.8.5.5
-
diff --git a/sys-cluster/hpx/hpx-0.9.10.ebuild b/sys-cluster/hpx/hpx-0.9.10.ebuild
deleted file mode 100644
index 3d785033e60..00000000000
--- a/sys-cluster/hpx/hpx-0.9.10.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit cmake-utils fortran-2 multilib python-any-r1 versionator
-
-SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${PN}_${PV}"
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-
-RDEPEND="
- tbb? ( dev-cpp/tbb )
- >=dev-libs/boost-1.49
- papi? ( dev-libs/papi )
- perftools? ( >=dev-util/google-perftools-1.7.1 )
- >=sys-apps/hwloc-1.8
- >=sys-libs/libunwind-1
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )
- doc? ( >=dev-libs/boost-1.56.0-r1[tools] )
-"
-REQUIRED_USE="
- jemalloc? ( !perftools !tbb )
- perftools? ( !jemalloc !tbb )
- tbb? ( !jemalloc !perftools )
- "
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE=Release
- local mycmakeargs=(
- -DHPX_BUILD_EXAMPLES=OFF
- -DHPX_MALLOC=system
- -DLIB=$(get_libdir)
- -Dcmake_dir=cmake
- $(cmake-utils_use doc HPX_BUILD_DOCUMENTATION)
- $(cmake-utils_use jemalloc HPX_JEMALLOC)
- $(cmake-utils_use test BUILD_TESTING)
- $(cmake-utils_use perftools HPX_GOOGLE_PERFTOOLS)
- $(cmake-utils_use papi HPX_PAPI)
- )
-
- use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
- use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
- use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- # avoid over-suscribing
- cmake-utils_src_make -j1 tests
-}
-
-src_install() {
- cmake-utils_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sys-cluster/hpx/hpx-0.9.8.ebuild b/sys-cluster/hpx/hpx-0.9.8.ebuild
deleted file mode 100644
index 7694c32d056..00000000000
--- a/sys-cluster/hpx/hpx-0.9.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-SRC_URI="http://stellar.cct.lsu.edu/files/${PN}_${PV}.7z"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${PN}_${PV}"
-
-inherit cmake-utils fortran-2 multilib python-any-r1
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-
-# TODO: some of the forced deps are may be optional
-# it would need to work the automagic
-RDEPEND="
- tbb? ( dev-cpp/tbb )
- >=dev-libs/boost-1.51
- dev-libs/libxml2
- papi? ( dev-libs/papi )
- sci-libs/hdf5
- >=sys-apps/hwloc-1.8
- >=sys-libs/libunwind-1
- sys-libs/zlib
- perftools? ( >=dev-util/google-perftools-1.7.1 )
-"
-DEPEND="${RDEPEND}
- app-arch/p7zip
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
- "${FILESDIR}"/hpx-0.9.8-install-path.patch
- "${FILESDIR}"/hpx-0.9.8-multilib.patch
- "${FILESDIR}"/hpx-0.9.8-cmake_dir.patch
-)
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE=Release
- local mycmakeargs=(
- -DHPX_BUILD_EXAMPLES=OFF
- -DLIB=$(get_libdir)
- -Dcmake_dir=cmake
- $(cmake-utils_use doc HPX_BUILD_DOCUMENTATION)
- $(cmake-utils_use jemalloc HPX_JEMALLOC)
- $(cmake-utils_use test BUILD_TESTING)
- $(cmake-utils_use perftools HPX_GOOGLE_PERFTOOLS)
- $(cmake-utils_use papi HPX_PAPI)
- )
- if use perftools; then
- mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
- elif use jemalloc; then
- mycmakeargs+=( -DHPX_MALLOC=jemalloc )
- elif use tbb; then
- mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
- else
- mycmakeargs+=( -DHPX_MALLOC=system )
- fi
- cmake-utils_src_configure
-}
-
-src_test() {
- # avoid over-suscribing
- cmake-utils_src_make -j1 tests
-}
-
-src_install() {
- cmake-utils_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sys-cluster/hpx/hpx-0.9.9.ebuild b/sys-cluster/hpx/hpx-0.9.9.ebuild
deleted file mode 100644
index 8001280e702..00000000000
--- a/sys-cluster/hpx/hpx-0.9.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit cmake-utils fortran-2 multilib python-any-r1 versionator
-
-MY_PV="$(replace_version_separator _ -)"
-
-SRC_URI="https://github.com/STEllAR-GROUP/hpx/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-DESCRIPTION="C++ runtime system for parallel and distributed applications"
-HOMEPAGE="http://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc papi +perftools tbb test"
-
-RDEPEND="
- tbb? ( dev-cpp/tbb )
- >=dev-libs/boost-1.49
- papi? ( dev-libs/papi )
- perftools? ( >=dev-util/google-perftools-1.7.1 )
- >=sys-apps/hwloc-1.8
- >=sys-libs/libunwind-1
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( ${PYTHON_DEPS} )
- doc? ( >=dev-libs/boost-1.56.0-r1[tools] )
-"
-REQUIRED_USE="
- jemalloc? ( !perftools !tbb )
- perftools? ( !jemalloc !tbb )
- tbb? ( !jemalloc !perftools )
- "
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE=Release
- local mycmakeargs=(
- -DHPX_BUILD_EXAMPLES=OFF
- -DHPX_MALLOC=system
- -DLIB=$(get_libdir)
- -Dcmake_dir=cmake
- $(cmake-utils_use doc HPX_BUILD_DOCUMENTATION)
- $(cmake-utils_use jemalloc HPX_JEMALLOC)
- $(cmake-utils_use test BUILD_TESTING)
- $(cmake-utils_use perftools HPX_GOOGLE_PERFTOOLS)
- $(cmake-utils_use papi HPX_PAPI)
- )
-
- use perftools && mycmakeargs+=( -DHPX_MALLOC=tcmalloc )
- use jemalloc && mycmakeargs+=( -DHPX_MALLOC=jemalloc )
- use tbb && mycmakeargs+=( -DHPX_MALLOC=tbbmalloc )
-
- cmake-utils_src_configure
-}
-
-src_test() {
- # avoid over-suscribing
- cmake-utils_src_make -j1 tests
-}
-
-src_install() {
- cmake-utils_src_install
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2020-06-24 14:29 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2020-06-24 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 3d00f3c5d1dc74f0ac5eeed23060315db2ef1c86
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu May 28 17:38:51 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jun 24 14:29:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d00f3c5
sys-cluster/hpx: Fix compilation against boost-1.73
This has been fixed upstream already. Adding the patch.
Closes: https://bugs.gentoo.org/725774
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/15993
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch | 79 +++++++++++++++++++++++
sys-cluster/hpx/hpx-1.4.1.ebuild | 1 +
2 files changed, 80 insertions(+)
diff --git a/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
new file mode 100644
index 00000000000..94271e6c0ec
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.4.1-placeholder.patch
@@ -0,0 +1,79 @@
+From 6bdbb6a3ad6ea57c46e9998e9efd46f86f5d5729 Mon Sep 17 00:00:00 2001
+From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
+Date: Tue, 28 Apr 2020 09:52:08 -0500
+Subject: [PATCH] Adding missing using placeholder::_X
+
+- flyby remove unneeded using statements
+
+(cherry picked from commit 1a6882195f9dc8d333ad12898fb88e3ca2931022)
+Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
+---
+ src/performance_counters/registry.cpp | 3 ---
+ src/runtime/agas/addressing_service.cpp | 3 ++-
+ tests/performance/network/network_storage/network_storage.cpp | 1 -
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/src/performance_counters/registry.cpp b/src/performance_counters/registry.cpp
+index 34c8d0e71d55..8da91f379a72 100644
+--- a/src/performance_counters/registry.cpp
++++ b/src/performance_counters/registry.cpp
+@@ -378,7 +378,6 @@ namespace hpx { namespace performance_counters
+ counter_status registry::create_raw_counter_value(counter_info const& info,
+ std::int64_t* countervalue, naming::gid_type& id, error_code& ec)
+ {
+- using util::placeholders::_1;
+ hpx::util::function_nonser<std::int64_t(bool)> func(
+ util::bind_front(wrap_counter, countervalue));
+ return create_raw_counter(info, func, id, ec);
+@@ -401,7 +400,6 @@ namespace hpx { namespace performance_counters
+ hpx::util::function_nonser<std::int64_t()> const& f, naming::gid_type& id,
+ error_code& ec)
+ {
+- using util::placeholders::_1;
+ hpx::util::function_nonser<std::int64_t(bool)> func(
+ util::bind_front(&wrap_raw_counter, f));
+ return create_raw_counter(info, func, id, ec);
+@@ -465,7 +463,6 @@ namespace hpx { namespace performance_counters
+ hpx::util::function_nonser<std::vector<std::int64_t>()> const& f,
+ naming::gid_type& id, error_code& ec)
+ {
+- using util::placeholders::_1;
+ hpx::util::function_nonser<std::vector<std::int64_t>(bool)> func(
+ util::bind_front(&wrap_raw_values_counter, f));
+ return create_raw_counter(info, func, id, ec);
+diff --git a/src/runtime/agas/addressing_service.cpp b/src/runtime/agas/addressing_service.cpp
+index f30760c0e05e..b416a28d12d8 100644
+--- a/src/runtime/agas/addressing_service.cpp
++++ b/src/runtime/agas/addressing_service.cpp
+@@ -1864,7 +1864,6 @@ future<hpx::id_type> addressing_service::on_symbol_namespace_event(
+ hpx::future<bool> f =
+ symbol_ns_.on_event(name, call_for_past_events, p.get_id());
+
+- using util::placeholders::_1;
+ return f.then(
+ hpx::launch::sync,
+ util::one_shot(util::bind_back(
+@@ -2356,6 +2355,8 @@ void addressing_service::register_counter_types()
+ util::bind_front(
+ &addressing_service::get_cache_erase_entry_time, this));
+
++ using util::placeholders::_1;
++ using util::placeholders::_2;
+ performance_counters::generic_counter_type_data const counter_types[] =
+ {
+ { "/agas/count/cache/entries", performance_counters::counter_raw,
+diff --git a/tests/performance/network/network_storage/network_storage.cpp b/tests/performance/network/network_storage/network_storage.cpp
+index 33fc1a66afa4..dfcffbafb180 100644
+--- a/tests/performance/network/network_storage/network_storage.cpp
++++ b/tests/performance/network/network_storage/network_storage.cpp
+@@ -802,7 +802,6 @@ void test_read(
+ ++FuturesWaiting[send_rank];
+ std::lock_guard<hpx::lcos::local::spinlock> lk(FuturesMutex);
+ #endif
+- using hpx::util::placeholders::_1;
+ std::size_t buffer_address =
+ reinterpret_cast<std::size_t>(general_buffer.data());
+ //
+--
+2.26.2
+
diff --git a/sys-cluster/hpx/hpx-1.4.1.ebuild b/sys-cluster/hpx/hpx-1.4.1.ebuild
index 9a3dc2abc76..964325329bb 100644
--- a/sys-cluster/hpx/hpx-1.4.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.4.1.ebuild
@@ -55,6 +55,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-boost.patch"
"${FILESDIR}/${P}-disable-failing-tests.patch"
+ "${FILESDIR}/${P}-placeholder.patch"
"${FILESDIR}/${P}-python.patch"
)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2021-07-23 14:33 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-07-23 14:33 UTC (permalink / raw
To: gentoo-commits
commit: d87f72e801ea53c3d2707558eefd1eca60e11acc
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Jul 15 19:31:45 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 14:33:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d87f72e8
sys-cluster/hpx: Bump to v1.7.0
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
sys-cluster/hpx/files/hpx-1.7.0-python.patch | 30 ++++++++
sys-cluster/hpx/hpx-1.7.0.ebuild | 102 +++++++++++++++++++++++++++
3 files changed, 133 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 3cdb83c4d05..dddef438e7f 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc
+DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
diff --git a/sys-cluster/hpx/files/hpx-1.7.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
new file mode 100644
index 00000000000..21b7ce3ceef
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
@@ -0,0 +1,30 @@
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+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 <kurt@kmk-computers.de>
+---
+ 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.7.0.ebuild b/sys-cluster/hpx/hpx-1.7.0.ebuild
new file mode 100644
index 00000000000..e7e729860da
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.7.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+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/${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://stellar.cct.lsu.edu/tag/hpx/"
+
+SLOT="0"
+LICENSE="Boost-1.0"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ ?? ( jemalloc perftools tbb )
+"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/boost:=
+ sys-apps/hwloc
+ sys-libs/zlib
+ mpi? ( virtual/mpi )
+ papi? ( dev-libs/papi )
+ perftools? ( dev-util/google-perftools )
+ tbb? ( dev-cpp/tbb )
+"
+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)
+ -DBUILD_TESTING=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}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2021-08-24 8:50 Joonas Niilola
0 siblings, 0 replies; 10+ messages in thread
From: Joonas Niilola @ 2021-08-24 8:50 UTC (permalink / raw
To: gentoo-commits
commit: 15113732bd81a948648da56f97b636189b0b934c
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu Aug 19 18:28:32 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 08:50:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15113732
sys-cluster/hpx: Drop old
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/22040
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 -
sys-cluster/hpx/files/hpx-1.7.0-python.patch | 30 --------
sys-cluster/hpx/hpx-1.7.0.ebuild | 104 ---------------------------
3 files changed, 135 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 7e92db81410..32cfd01e4d9 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,2 +1 @@
-DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
DIST hpx-1.7.1.tar.gz 4751163 BLAKE2B 21e417dab5c118b16ab8d2955b0d65a95ca7d0e2f777496306855e4098cfb400962dd9e0cf03ebbab5e3348f2f985d1053d0a70124c0925c77859e8ada209cec SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
diff --git a/sys-cluster/hpx/files/hpx-1.7.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
deleted file mode 100644
index 21b7ce3ceef..00000000000
--- a/sys-cluster/hpx/files/hpx-1.7.0-python.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-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 <kurt@kmk-computers.de>
----
- 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.7.0.ebuild b/sys-cluster/hpx/hpx-1.7.0.ebuild
deleted file mode 100644
index 2ab8ea741f3..00000000000
--- a/sys-cluster/hpx/hpx-1.7.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/${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://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="examples jemalloc mpi papi +perftools tbb"
-# tests fail to compile
-RESTRICT="test"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- ?? ( jemalloc perftools tbb )
-"
-
-BDEPEND="
- virtual/pkgconfig
-"
-RDEPEND="
- ${PYTHON_DEPS}
- dev-cpp/asio
- dev-libs/boost:=
- sys-apps/hwloc
- sys-libs/zlib
- jemalloc? ( dev-libs/jemalloc )
- mpi? ( virtual/mpi )
- papi? ( dev-libs/papi )
- perftools? ( dev-util/google-perftools )
- tbb? ( dev-cpp/tbb )
-"
-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)
- -DBUILD_TESTING=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}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2022-06-03 8:35 Florian Schmaus
0 siblings, 0 replies; 10+ messages in thread
From: Florian Schmaus @ 2022-06-03 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 5777e5659dffc667a1b200323d842a4d00002c07
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Mon May 30 18:56:48 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 08:35:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5777e565
sys-cluster/hpx: drop 1.7.1-r1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/25706
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 -
sys-cluster/hpx/files/hpx-1.7.1-python.patch | 30 --------
sys-cluster/hpx/hpx-1.7.1-r1.ebuild | 104 ---------------------------
3 files changed, 135 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 0e04f6bf71bc..4783253e8786 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,2 +1 @@
-DIST hpx-1.7.1.tar.gz 4751163 BLAKE2B 21e417dab5c118b16ab8d2955b0d65a95ca7d0e2f777496306855e4098cfb400962dd9e0cf03ebbab5e3348f2f985d1053d0a70124c0925c77859e8ada209cec SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3
DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7
diff --git a/sys-cluster/hpx/files/hpx-1.7.1-python.patch b/sys-cluster/hpx/files/hpx-1.7.1-python.patch
deleted file mode 100644
index 21b7ce3ceeff..000000000000
--- a/sys-cluster/hpx/files/hpx-1.7.1-python.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-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 <kurt@kmk-computers.de>
----
- 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.7.1-r1.ebuild b/sys-cluster/hpx/hpx-1.7.1-r1.ebuild
deleted file mode 100644
index c1be762e1c26..000000000000
--- a/sys-cluster/hpx/hpx-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/${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://stellar.cct.lsu.edu/tag/hpx/"
-
-SLOT="0"
-LICENSE="Boost-1.0"
-IUSE="examples jemalloc mpi papi +perftools tbb"
-# 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:=
- sys-libs/zlib
- jemalloc? ( dev-libs/jemalloc:= )
- mpi? ( virtual/mpi )
- papi? ( dev-libs/papi )
- perftools? ( dev-util/google-perftools:= )
- tbb? ( dev-cpp/tbb:= )
-"
-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)
- -DBUILD_TESTING=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}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2022-07-09 4:56 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-07-09 4:56 UTC (permalink / raw
To: gentoo-commits
commit: 5ca83cbca717c9d04ffa46f9a7fce31fe32b2d95
Author: brahmajit das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Sat Jul 9 04:40:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 04:56:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca83cbc
sys-cluster/hpx: Fix building on musl
These patches fixes building on musl. I've tried to document the patches
to the best of my abilities.
Mainly fixes the RTLD_DI_ORIGIN not being present in musl.
However with this PR [1] we won't be requiring these patches anymore
from 1.8.1
[1]: https://github.com/STEllAR-GROUP/hpx/pull/5947
Closes: https://bugs.gentoo.org/829242
Signed-off-by: brahmajit das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26281
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-1.8.0-fix-musl-exec_pagesize-not-defined.patch | 47 ++++++++++++++++++++++
.../hpx/files/hpx-1.8.0-fix-musl-execinfo.patch | 16 ++++++++
.../hpx-1.8.0-fix-musl-rtdl-not-declared.patch | 25 ++++++++++++
sys-cluster/hpx/hpx-1.8.0.ebuild | 3 ++
4 files changed, 91 insertions(+)
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
new file mode 100644
index 000000000000..d2e54b9df256
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
@@ -0,0 +1,47 @@
+# EXEC_PAGESIZE is a preprocessor macro from the Linux Kernel headers. Include
+# the appropriate Linux header file <linux/param.h>
+#
+# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
+# 1.8.1 we can drop these patches
+--- a/components/performance_counters/memory/src/mem_counter_linux.cpp
++++ b/components/performance_counters/memory/src/mem_counter_linux.cpp
+@@ -14,6 +14,11 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+
++// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
++#ifdef __linux__
++#include <linux/param.h>
++#endif
++
+ #include <hpx/modules/errors.hpp>
+ #include <hpx/modules/format.hpp>
+
+--- a/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp
++++ b/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp
+@@ -37,6 +37,11 @@
+ #include <stdexcept>
+ #include <sys/param.h>
+
++// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
++#ifdef __linux__
++#include <linux/param.h>
++#endif
++
+ #if defined(HPX_HAVE_STACKOVERFLOW_DETECTION)
+
+ #include <cstring>
+--- a/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp
++++ b/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp
+@@ -67,6 +67,11 @@
+ #define EXEC_PAGESIZE static_cast<std::size_t>(sysconf(_SC_PAGESIZE))
+ #endif
+
++// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
++#ifdef __linux__
++#include <linux/param.h>
++#endif
++
+ /**
+ * Stack allocation routines and trampolines for setcontext
+ */
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
new file mode 100644
index 000000000000..4c82ca3f6be1
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
@@ -0,0 +1,16 @@
+# Check for execinfo only on glibc and ulibc systems.
+#
+# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
+# 1.8.1 we can drop these patches
+--- a/libs/core/debugging/src/backtrace.cpp
++++ b/libs/core/debugging/src/backtrace.cpp
+@@ -19,7 +19,9 @@
+
+ #if (defined(__linux) || defined(__APPLE__) || defined(__sun)) && \
+ (!defined(__ANDROID__) || !defined(ANDROID))
++#if defined(__GLIBC__)
+ #define HPX_HAVE_EXECINFO
++#endif
+ #define HPX_HAVE_DLFCN
+ #if defined(__GNUC__) && !defined(__clang__)
+ #define HPX_HAVE_UNWIND
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
new file mode 100644
index 000000000000..0264aeab52f5
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
@@ -0,0 +1,25 @@
+# RTLD_DI_ORIGIN is not defined in musl as a result hpx fails to build.
+# Closes: https://bugs.gentoo.org/829242
+#
+# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
+# 1.8.1 we can drop these patches
+--- a/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
++++ b/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
+@@ -319,6 +319,7 @@ namespace hpx { namespace util { namespace plugin {
+ std::string result;
+
+ #if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__APPLE__)
++#if defined(RTLD_DI_ORIGIN)
+ char directory[PATH_MAX] = {'\0'};
+ const_cast<dll&>(*this).LoadLibrary(ec);
+ if (!ec && ::dlinfo(dll_handle, RTLD_DI_ORIGIN, directory) < 0)
+@@ -333,6 +334,9 @@ namespace hpx { namespace util { namespace plugin {
+ }
+ result = directory;
+ ::dlerror(); // Clear the error state.
++#else
++ result = path(dll_name).parent_path().string();
++#endif
+ #elif defined(__APPLE__)
+ // SO staticfloat's solution
+ const_cast<dll&>(*this).LoadLibrary(ec);
diff --git a/sys-cluster/hpx/hpx-1.8.0.ebuild b/sys-cluster/hpx/hpx-1.8.0.ebuild
index a1b86f1f953f..118e080a1120 100644
--- a/sys-cluster/hpx/hpx-1.8.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.8.0.ebuild
@@ -47,6 +47,9 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${P}-python.patch"
+ "${FILESDIR}/${P}-fix-musl-exec_pagesize-not-defined.patch"
+ "${FILESDIR}/${P}-fix-musl-execinfo.patch"
+ "${FILESDIR}/${P}-fix-musl-rtdl-not-declared.patch"
)
hpx_memory_requirement() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2022-08-14 16:06 Florian Schmaus
0 siblings, 0 replies; 10+ messages in thread
From: Florian Schmaus @ 2022-08-14 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 6670c333d5a10ecde92582439f05eb8eef069ebc
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Sun Aug 7 09:22:56 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 16:03:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6670c333
sys-cluster/hpx: add 1.8.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/26772
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sys-cluster/hpx/Manifest | 1 +
sys-cluster/hpx/files/hpx-1.8.1-python.patch | 30 ++++++++
sys-cluster/hpx/hpx-1.8.1.ebuild | 105 +++++++++++++++++++++++++++
3 files changed, 136 insertions(+)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 4783253e8786..ab1db7886afc 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1,2 @@
DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7
+DIST hpx-1.8.1.tar.gz 5242024 BLAKE2B 0a08c004573cf2bebff4042f859fa457bd821bd55b58aa0e0e56dfc8b80378469c24daa94789196d9486a3321598031a0930306e2e76c311b6fd8179e9bc61a1 SHA512 af2471a04dd0a3c414907ed06661ab1c6f6a49cc09d1ed3ae5d5587ca365270797a1d2ce9d0320dc7d7f9ff2c6d29037c7fbb84fa6d9c0033628ba7036f12986
diff --git a/sys-cluster/hpx/files/hpx-1.8.1-python.patch b/sys-cluster/hpx/files/hpx-1.8.1-python.patch
new file mode 100644
index 000000000000..21b7ce3ceeff
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.1-python.patch
@@ -0,0 +1,30 @@
+From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
+From: Kurt Kanzenbach <kurt@kmk-computers.de>
+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 <kurt@kmk-computers.de>
+---
+ 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.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild
new file mode 100644
index 000000000000..a1b86f1f953f
--- /dev/null
+++ b/sys-cluster/hpx/hpx-1.8.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+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/${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}/${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}"
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2022-08-14 20:07 Florian Schmaus
0 siblings, 0 replies; 10+ messages in thread
From: Florian Schmaus @ 2022-08-14 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 2210db61e7c70445f8cc9b2a213295193f123fd0
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 16:47:37 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 20:07:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2210db61
sys-cluster/hpx: de-duplicate duplicate patches
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sys-cluster/hpx/files/hpx-1.8.1-python.patch | 30 ----------------------------
sys-cluster/hpx/hpx-1.8.1.ebuild | 2 +-
2 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/sys-cluster/hpx/files/hpx-1.8.1-python.patch b/sys-cluster/hpx/files/hpx-1.8.1-python.patch
deleted file mode 100644
index 21b7ce3ceeff..000000000000
--- a/sys-cluster/hpx/files/hpx-1.8.1-python.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-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 <kurt@kmk-computers.de>
----
- 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.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild
index a1b86f1f953f..f99ace8db3a8 100644
--- a/sys-cluster/hpx/hpx-1.8.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.8.1.ebuild
@@ -46,7 +46,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-python.patch"
+ "${FILESDIR}/${PN}-1.8.0-python.patch"
)
hpx_memory_requirement() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2023-02-27 11:22 Florian Schmaus
0 siblings, 0 replies; 10+ messages in thread
From: Florian Schmaus @ 2023-02-27 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 3e011cd6f314f2032f5e6918dbdda5b308f47edb
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Wed Feb 22 20:48:47 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 11:22:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e011cd6
sys-cluster/hpx: Fix build failure
Fix build failure due to missing header file regarding std::intmax_t.
Patch taken from upstream master branch.
Closes: https://bugs.gentoo.org/895212
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/29734
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../hpx/files/hpx-1.8.1-fix-intmax-error.patch | 24 ++++++++++++++++++++++
sys-cluster/hpx/hpx-1.8.1.ebuild | 1 +
2 files changed, 25 insertions(+)
diff --git a/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch b/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch
new file mode 100644
index 000000000000..58d6a70a15ff
--- /dev/null
+++ b/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch
@@ -0,0 +1,24 @@
+From 9ce60348a5401fe58b6fd7333d3d7e19f0d6d8ac Mon Sep 17 00:00:00 2001
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Wed, 8 Feb 2023 12:32:11 +0000
+Subject: [PATCH] Add missing header for std::intmax_t
+
+---
+ .../include/hpx/iterator_support/counting_iterator.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp b/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
+index e6e6c7a99cb8..1414648cc2cf 100644
+--- a/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
++++ b/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
+@@ -18,6 +18,7 @@
+ #include <hpx/type_support/lazy_conditional.hpp>
+
+ #include <cstddef>
++#include <cstdint>
+ #include <iterator>
+ #include <type_traits>
+
+--
+2.39.2
+
diff --git a/sys-cluster/hpx/hpx-1.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild
index 3de266f8b503..a875850567d3 100644
--- a/sys-cluster/hpx/hpx-1.8.1.ebuild
+++ b/sys-cluster/hpx/hpx-1.8.1.ebuild
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-1.8.0-python.patch"
+ "${FILESDIR}/${PN}-1.8.1-fix-intmax-error.patch"
)
hpx_memory_requirement() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/
@ 2023-05-20 6:28 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-05-20 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 9a291784febe71a86632162508d54a563e09c72d
Author: Kurt Kanzenbach <kurt <AT> kmk-computers <DOT> de>
AuthorDate: Thu May 18 09:49:49 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 06:27:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a291784
sys-cluster/hpx: drop 1.8.0, 1.8.1
Signed-off-by: Kurt Kanzenbach <kurt <AT> kmk-computers.de>
Closes: https://github.com/gentoo/gentoo/pull/31082
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/hpx/Manifest | 2 -
...-1.8.0-fix-musl-exec_pagesize-not-defined.patch | 47 ---------
.../hpx/files/hpx-1.8.0-fix-musl-execinfo.patch | 16 ---
.../hpx-1.8.0-fix-musl-rtdl-not-declared.patch | 25 -----
.../hpx/files/hpx-1.8.1-fix-intmax-error.patch | 18 ----
sys-cluster/hpx/hpx-1.8.0.ebuild | 108 ---------------------
sys-cluster/hpx/hpx-1.8.1.ebuild | 106 --------------------
7 files changed, 322 deletions(-)
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 53574bf4e9f4..3b21b3bb03e4 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1,3 +1 @@
-DIST hpx-1.8.0.tar.gz 5209106 BLAKE2B aab9d3743cc2d73c2d3a6a2f2323e35dbe38cf506618475ea627d9c0d92855632f646404f5b257e2260eabe6bb22e8090bc3db2aafd9f4f71a0eeb62d7286247 SHA512 80afc93d517144d5c11164f82d7f0dd6fd71c079fb65930532c4fd96b6a5497cdf972bee8a6251035548a3662579a3bee5c04802569f47bc3c042ca868716cb7
-DIST hpx-1.8.1.tar.gz 5242024 BLAKE2B 0a08c004573cf2bebff4042f859fa457bd821bd55b58aa0e0e56dfc8b80378469c24daa94789196d9486a3321598031a0930306e2e76c311b6fd8179e9bc61a1 SHA512 af2471a04dd0a3c414907ed06661ab1c6f6a49cc09d1ed3ae5d5587ca365270797a1d2ce9d0320dc7d7f9ff2c6d29037c7fbb84fa6d9c0033628ba7036f12986
DIST hpx-1.9.0.tar.gz 5648944 BLAKE2B 642fa16e97954973715bbd87b242b1f7ed13c64dfcffb00f50d7826dd114b3908a350b87508b9b6fde66df8fd772ae1b501f209bc200e3331312c0cc4ab88e80 SHA512 a9b55999e0d9f79433a44f0f7f21340e947fa0ba354ecb007340664a0f4820be1f7723075d18775a395a455648bbb4bff85061e6f7ad4b551b93943e845d4443
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
deleted file mode 100644
index d2e54b9df256..000000000000
--- a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-exec_pagesize-not-defined.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-# EXEC_PAGESIZE is a preprocessor macro from the Linux Kernel headers. Include
-# the appropriate Linux header file <linux/param.h>
-#
-# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
-# 1.8.1 we can drop these patches
---- a/components/performance_counters/memory/src/mem_counter_linux.cpp
-+++ b/components/performance_counters/memory/src/mem_counter_linux.cpp
-@@ -14,6 +14,11 @@
- #include <sys/types.h>
- #include <unistd.h>
-
-+// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
-+#ifdef __linux__
-+#include <linux/param.h>
-+#endif
-+
- #include <hpx/modules/errors.hpp>
- #include <hpx/modules/format.hpp>
-
---- a/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp
-+++ b/libs/core/coroutines/include/hpx/coroutines/detail/context_linux_x86.hpp
-@@ -37,6 +37,11 @@
- #include <stdexcept>
- #include <sys/param.h>
-
-+// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
-+#ifdef __linux__
-+#include <linux/param.h>
-+#endif
-+
- #if defined(HPX_HAVE_STACKOVERFLOW_DETECTION)
-
- #include <cstring>
---- a/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp
-+++ b/libs/core/coroutines/include/hpx/coroutines/detail/posix_utility.hpp
-@@ -67,6 +67,11 @@
- #define EXEC_PAGESIZE static_cast<std::size_t>(sysconf(_SC_PAGESIZE))
- #endif
-
-+// Fix for musl. Use linux/param.h for EXEC_PAGESIZE
-+#ifdef __linux__
-+#include <linux/param.h>
-+#endif
-+
- /**
- * Stack allocation routines and trampolines for setcontext
- */
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
deleted file mode 100644
index 4c82ca3f6be1..000000000000
--- a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-execinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# Check for execinfo only on glibc and ulibc systems.
-#
-# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
-# 1.8.1 we can drop these patches
---- a/libs/core/debugging/src/backtrace.cpp
-+++ b/libs/core/debugging/src/backtrace.cpp
-@@ -19,7 +19,9 @@
-
- #if (defined(__linux) || defined(__APPLE__) || defined(__sun)) && \
- (!defined(__ANDROID__) || !defined(ANDROID))
-+#if defined(__GLIBC__)
- #define HPX_HAVE_EXECINFO
-+#endif
- #define HPX_HAVE_DLFCN
- #if defined(__GNUC__) && !defined(__clang__)
- #define HPX_HAVE_UNWIND
diff --git a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch b/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
deleted file mode 100644
index 0264aeab52f5..000000000000
--- a/sys-cluster/hpx/files/hpx-1.8.0-fix-musl-rtdl-not-declared.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# RTLD_DI_ORIGIN is not defined in musl as a result hpx fails to build.
-# Closes: https://bugs.gentoo.org/829242
-#
-# With this PR https://github.com/STEllAR-GROUP/hpx/pull/5947 merged, from
-# 1.8.1 we can drop these patches
---- a/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
-+++ b/libs/core/plugin/include/hpx/plugin/detail/dll_dlopen.hpp
-@@ -319,6 +319,7 @@ namespace hpx { namespace util { namespace plugin {
- std::string result;
-
- #if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__APPLE__)
-+#if defined(RTLD_DI_ORIGIN)
- char directory[PATH_MAX] = {'\0'};
- const_cast<dll&>(*this).LoadLibrary(ec);
- if (!ec && ::dlinfo(dll_handle, RTLD_DI_ORIGIN, directory) < 0)
-@@ -333,6 +334,9 @@ namespace hpx { namespace util { namespace plugin {
- }
- result = directory;
- ::dlerror(); // Clear the error state.
-+#else
-+ result = path(dll_name).parent_path().string();
-+#endif
- #elif defined(__APPLE__)
- // SO staticfloat's solution
- const_cast<dll&>(*this).LoadLibrary(ec);
diff --git a/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch b/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch
deleted file mode 100644
index 1f5041047a59..000000000000
--- a/sys-cluster/hpx/files/hpx-1.8.1-fix-intmax-error.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 9ce60348a5401fe58b6fd7333d3d7e19f0d6d8ac Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Wed, 8 Feb 2023 12:32:11 +0000
-Subject: [PATCH] Add missing header for std::intmax_t
-
---- a/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
-+++ b/libs/core/iterator_support/include/hpx/iterator_support/counting_iterator.hpp
-@@ -18,6 +18,7 @@
- #include <hpx/type_support/lazy_conditional.hpp>
-
- #include <cstddef>
-+#include <cstdint>
- #include <iterator>
- #include <type_traits>
-
---
-2.39.2
-
diff --git a/sys-cluster/hpx/hpx-1.8.0.ebuild b/sys-cluster/hpx/hpx-1.8.0.ebuild
deleted file mode 100644
index 95f5fe9b725c..000000000000
--- a/sys-cluster/hpx/hpx-1.8.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/${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}/${P}-python.patch"
- "${FILESDIR}/${P}-fix-musl-exec_pagesize-not-defined.patch"
- "${FILESDIR}/${P}-fix-musl-execinfo.patch"
- "${FILESDIR}/${P}-fix-musl-rtdl-not-declared.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.8.1.ebuild b/sys-cluster/hpx/hpx-1.8.1.ebuild
deleted file mode 100644
index a875850567d3..000000000000
--- a/sys-cluster/hpx/hpx-1.8.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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/${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"
- "${FILESDIR}/${PN}-1.8.1-fix-intmax-error.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}"
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-05-20 6:28 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-24 14:29 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/hpx/, sys-cluster/hpx/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-05-20 6:28 Sam James
2023-02-27 11:22 Florian Schmaus
2022-08-14 20:07 Florian Schmaus
2022-08-14 16:06 Florian Schmaus
2022-07-09 4:56 Sam James
2022-06-03 8:35 Florian Schmaus
2021-08-24 8:50 Joonas Niilola
2021-07-23 14:33 Joonas Niilola
2018-06-25 4:44 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox