sys-cluster/hpx: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9
This commit is contained in:
Andreas Sturmlechner
2018-06-03 16:07:49 +02:00
parent 8d15a48ad1
commit a5d63e17ed
7 changed files with 0 additions and 503 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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
}

View File

@@ -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
}

View File

@@ -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
}