diff --git a/science/py-hoomd-blue/Makefile b/science/py-hoomd-blue/Makefile index c6f16513e948..a2de9dba94a5 100644 --- a/science/py-hoomd-blue/Makefile +++ b/science/py-hoomd-blue/Makefile @@ -1,51 +1,54 @@ PORTNAME= hoomd-blue DISTVERSIONPREFIX= v DISTVERSION= 3.0.0-beta.13 CATEGORIES= science # physics PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= 3f8ed3abb36aa51c6d91c3ff1c1563ffc6ee37c2.patch:-p1 + MAINTAINER= yuri@FreeBSD.org COMMENT= Molecular dynamics and Monte Carlo soft matter simulation LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= pybind11>0:devel/pybind11 USES= cmake:testing compiler:c++17-lang eigen:3 localbase:ldflags python shebangfix # see https://github.com/glotzerlab/hoomd-blue/issues/1204 USE_GITHUB= yes GH_ACCOUNT= glotzerlab GH_TUPLE= glotzerlab:libgetar:85de0f2355ea938474452aaf6bb78904a91293ec:glotzerlab_libgetar/hoomd/extern/libgetar \ glotzerlab:upp11:0c1fb8dfb4bcdc1c5c4eff9165539b15e70c4360:glotzerlab_upp11/hoomd/extern/upp11 \ glotzerlab:nano-signal-slot:34223a4a7e97f8e114ef007e5360cf7a71265da3:glotzerlab_nano_signal_slot/hoomd/extern/nano-signal-slot \ glotzerlab:cub:c3cceac115c072fb63df1836ff46d8c60d9eb304:glotzerlab_cub/hoomd/extern/cub \ glotzerlab:quickhull:a706b5ba0d863b241668038be9eef67afbfaabac:glotzerlab_quickhull/hoomd/extern/quickhull \ glotzerlab:random123:7f2371b8c597a486cd33fb421a196d78efe08043:glotzerlab_random123/hoomd/extern/random123 \ glotzerlab:HIP:849fb35f674c12f7c534153e2656b27997641866:glotzerlab_HIP/hoomd/extern/HIP \ glotzerlab:hipCUB:c70e19332a8402049b3359b409e50220a759c42d:glotzerlab_hipCUB/hoomd/extern/hipCUB \ mphowardlab:neighbor:ba0f06869b766066a7068852fa3b8c5fa746f71f:mphowardlab_neighbor/hoomd/extern/neighbor \ mphowardlab:hipper:b6da049a516ada03e4e1b66ca6b4c2c7c9668595:mphowardlab_hipper1/hoomd/extern/hipper \ glotzerlab:hoomd-examples:5a5e4e11e96397b761e90b27983cc38e2fb1a324:glotzerlab_hoomd_examples/sphinx-doc/tutorial \ mphowardlab:hipper:b6da049a516ada03e4e1b66ca6b4c2c7c9668595:mphowardlab_hipper2/hoomd/extern/neighbor/extern/hipper SHEBANG_GLOB= *.sh CMAKE_OFF= BUILD_TESTING LDFLAGS+= -lexecinfo OPTIONS_DEFINE= MPI TBB OPTIONS_DEFAULT= MPI TBB OPTIONS_SUB= yes MPI_CMAKE_BOOL= ENABLE_MPI MPI_BUILD_DEPENDS= cereal>0:devel/cereal MPI_LIB_DEPENDS= libmpi.so:net/mpich TBB_DESC= Enable support for Threading Building Blocks (TBB) TBB_CMAKE_BOOL= ENABLE_TBB TBB_LIB_DEPENDS= libtbb.so:devel/onetbb .include diff --git a/science/py-hoomd-blue/distinfo b/science/py-hoomd-blue/distinfo index 4452bb97ba91..4430413de391 100644 --- a/science/py-hoomd-blue/distinfo +++ b/science/py-hoomd-blue/distinfo @@ -1,27 +1,29 @@ -TIMESTAMP = 1642744229 +TIMESTAMP = 1642797728 SHA256 (glotzerlab-hoomd-blue-v3.0.0-beta.13_GH0.tar.gz) = e655a9afc7a8f7fe668552e0ffd9ba4a38884e791afd8ab45d81cc0df614fb40 SIZE (glotzerlab-hoomd-blue-v3.0.0-beta.13_GH0.tar.gz) = 2525133 SHA256 (glotzerlab-libgetar-85de0f2355ea938474452aaf6bb78904a91293ec_GH0.tar.gz) = 12815869b556c09f537e3d5ebed830298c61d458a8c967a60f7af607201750ed SIZE (glotzerlab-libgetar-85de0f2355ea938474452aaf6bb78904a91293ec_GH0.tar.gz) = 2600137 SHA256 (glotzerlab-upp11-0c1fb8dfb4bcdc1c5c4eff9165539b15e70c4360_GH0.tar.gz) = 759695139bddae1d8a7cd52c967b856d6debf28fb37ea177f78c4434e2b210a8 SIZE (glotzerlab-upp11-0c1fb8dfb4bcdc1c5c4eff9165539b15e70c4360_GH0.tar.gz) = 21058 SHA256 (glotzerlab-nano-signal-slot-34223a4a7e97f8e114ef007e5360cf7a71265da3_GH0.tar.gz) = d15030482c82d9e4a99c2f67d8ef23b33cc318dd48ac0f8e804c6d4750f27ff4 SIZE (glotzerlab-nano-signal-slot-34223a4a7e97f8e114ef007e5360cf7a71265da3_GH0.tar.gz) = 4748 SHA256 (glotzerlab-cub-c3cceac115c072fb63df1836ff46d8c60d9eb304_GH0.tar.gz) = ecb8b5b7c2e9493b1661cf023b29edcf5cdb80de7033e90f286501251e293b97 SIZE (glotzerlab-cub-c3cceac115c072fb63df1836ff46d8c60d9eb304_GH0.tar.gz) = 385598 SHA256 (glotzerlab-quickhull-a706b5ba0d863b241668038be9eef67afbfaabac_GH0.tar.gz) = 5596540c3c8ecc7bd4c849ae6ad0d755f6435582d181dddad510c771df8db370 SIZE (glotzerlab-quickhull-a706b5ba0d863b241668038be9eef67afbfaabac_GH0.tar.gz) = 15850 SHA256 (glotzerlab-random123-7f2371b8c597a486cd33fb421a196d78efe08043_GH0.tar.gz) = c96b9240953197387977244858d624c81bef15d74c5badd77a07c8d29cb30a8e SIZE (glotzerlab-random123-7f2371b8c597a486cd33fb421a196d78efe08043_GH0.tar.gz) = 648611 SHA256 (glotzerlab-HIP-849fb35f674c12f7c534153e2656b27997641866_GH0.tar.gz) = 14b0f3bd698029ce34d0b7c14ed2ed3a3d0551c9f8660cdd84a25297615c8bf5 SIZE (glotzerlab-HIP-849fb35f674c12f7c534153e2656b27997641866_GH0.tar.gz) = 898907 SHA256 (glotzerlab-hipCUB-c70e19332a8402049b3359b409e50220a759c42d_GH0.tar.gz) = f3dbd921ea8c5fe9068d6d9e6e9112c11c7e18488169ce48423d9fdb014536c6 SIZE (glotzerlab-hipCUB-c70e19332a8402049b3359b409e50220a759c42d_GH0.tar.gz) = 110500 SHA256 (mphowardlab-neighbor-ba0f06869b766066a7068852fa3b8c5fa746f71f_GH0.tar.gz) = 089129a1539d8e993f725017f1aadc60f9e40116e8a65dfbe70b0df9ac2d7cf3 SIZE (mphowardlab-neighbor-ba0f06869b766066a7068852fa3b8c5fa746f71f_GH0.tar.gz) = 49039 SHA256 (mphowardlab-hipper-b6da049a516ada03e4e1b66ca6b4c2c7c9668595_GH0.tar.gz) = c64a484884eaab3eb9fd8f7b27b144a7bfadfeab101e95d82bc2a6f7e4fb7cec SIZE (mphowardlab-hipper-b6da049a516ada03e4e1b66ca6b4c2c7c9668595_GH0.tar.gz) = 20228 SHA256 (glotzerlab-hoomd-examples-5a5e4e11e96397b761e90b27983cc38e2fb1a324_GH0.tar.gz) = 9fe5ed481937103e1d9ffa60f1c6ec46f2e93647f4a88681e132223d5133a951 SIZE (glotzerlab-hoomd-examples-5a5e4e11e96397b761e90b27983cc38e2fb1a324_GH0.tar.gz) = 5054053 SHA256 (mphowardlab-hipper-b6da049a516ada03e4e1b66ca6b4c2c7c9668595_GH0.tar.gz) = c64a484884eaab3eb9fd8f7b27b144a7bfadfeab101e95d82bc2a6f7e4fb7cec SIZE (mphowardlab-hipper-b6da049a516ada03e4e1b66ca6b4c2c7c9668595_GH0.tar.gz) = 20228 +SHA256 (3f8ed3abb36aa51c6d91c3ff1c1563ffc6ee37c2.patch) = c2e0fecf532d9a73dd42cfce40302d7fe8402ff5d98620b70aca434032c1d0c9 +SIZE (3f8ed3abb36aa51c6d91c3ff1c1563ffc6ee37c2.patch) = 2719 diff --git a/science/py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake b/science/py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake deleted file mode 100644 index 51c295f79964..000000000000 --- a/science/py-hoomd-blue/files/patch-CMake_hoomd_HOOMDMPISetup.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- CMake/hoomd/HOOMDMPISetup.cmake.orig 2022-01-21 08:21:04 UTC -+++ CMake/hoomd/HOOMDMPISetup.cmake -@@ -13,7 +13,7 @@ if (ENABLE_MPI) - - find_path(cereal_INCLUDE_DIR NAMES cereal/cereal.hpp - PATHS ${CMAKE_INSTALL_PREFIX}/include) -- add_library(cereal INTERFACE IMPORTED) -+ #add_library(cereal INTERFACE IMPORTED) - set_target_properties(cereal PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${cereal_INCLUDE_DIR}") - find_package_message(cereal "Could not find cereal, assuming it is on a default path" "[${cereal_INCLUDE_DIR}]") - endif() diff --git a/science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt b/science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt deleted file mode 100644 index 0e99b6d6de1b..000000000000 --- a/science/py-hoomd-blue/files/patch-hoomd_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- hoomd/CMakeLists.txt.orig 2022-01-21 08:28:13 UTC -+++ hoomd/CMakeLists.txt -@@ -338,7 +338,7 @@ endif() - # Libraries and compile definitions for MPI enabled builds - if (ENABLE_MPI) - target_compile_definitions(_hoomd PUBLIC ENABLE_MPI) -- target_link_libraries(_hoomd PUBLIC MPI::MPI_CXX cereal) -+ target_link_libraries(_hoomd PUBLIC MPI::MPI_CXX) - - if (ENABLE_MPI_CUDA) - target_compile_definitions(_hoomd PUBLIC ENABLE_MPI_CUDA)