diff options
4 files changed, 6 insertions, 136 deletions
diff --git a/var/spack/repos/builtin/packages/podio/cpack.patch b/var/spack/repos/builtin/packages/podio/cpack.patch deleted file mode 100644 index e685f9bc13..0000000000 --- a/var/spack/repos/builtin/packages/podio/cpack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,7 +86,7 @@ include(cmake/podioMacros.cmake) - include(CTest) - - #--- enable CPack -------------------------------------------------------------- --include(cmake/podioCPack.cmake) -+#include(cmake/podioCPack.cmake) - - #--- target for Doxygen documentation ------------------------------------------ - if(CREATE_DOC) diff --git a/var/spack/repos/builtin/packages/podio/dictloading.patch b/var/spack/repos/builtin/packages/podio/dictloading.patch deleted file mode 100644 index 15ec301b13..0000000000 --- a/var/spack/repos/builtin/packages/podio/dictloading.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 120a899..05991f1 100755 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -41,7 +41,7 @@ SET(headers - ${CMAKE_SOURCE_DIR}/include/podio/PythonEventStore.h - ) - PODIO_GENERATE_DICTIONARY(podioDict ${headers} SELECTION selection.xml -- OPTIONS --library ${CMAKE_SHARED_LIBRARY_PREFIX}podio${CMAKE_SHARED_LIBRARY_SUFFIX} -+ OPTIONS --library ${CMAKE_SHARED_LIBRARY_PREFIX}podioDict${CMAKE_SHARED_LIBRARY_SUFFIX} - ) - # prevent generating dictionary twice - set_target_properties(podioDict-dictgen PROPERTIES EXCLUDE_FROM_ALL TRUE) -@@ -58,5 +58,5 @@ install(TARGETS podio podioDict podioRootIO - install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/podio DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/podioDictDict.rootmap -- ${CMAKE_CURRENT_BINARY_DIR}/libpodio_rdict.pcm -+ ${CMAKE_CURRENT_BINARY_DIR}/libpodioDict_rdict.pcm - DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/var/spack/repos/builtin/packages/podio/package.py b/var/spack/repos/builtin/packages/podio/package.py index 0b57d53321..01a9bf11f1 100644 --- a/var/spack/repos/builtin/packages/podio/package.py +++ b/var/spack/repos/builtin/packages/podio/package.py @@ -66,86 +66,6 @@ class Podio(CMakePackage): sha256="d8208f98496af68ca8d02d302f428aab510e50d07575b90c3477fff7e499335b", deprecated=True, ) - version( - "0.16.2", - sha256="faf7167290faf322f23c734adff19904b10793b5ab14e1dfe90ce257c225114b", - deprecated=True, - ) - version( - "0.16.1", - sha256="23cd8dfd00f9cd5ae0b473ae3279fa2c22a2d90fb6c07b37d56e63a80dd76ab2", - deprecated=True, - ) - version( - "0.16", - sha256="4e149c2c9be9f9ca3a6d863498bb0f642dda1a43a19ac1afe7f99854ded5c510", - deprecated=True, - ) - version( - "0.15", - sha256="6c1520877ba1bce250e35a2a56c0a3da89fae0916c5ed7d5548d658237e067d9", - deprecated=True, - ) - version( - "0.14.3", - sha256="2a7a405dedc7f6980a0aad7df87b427a1f43bcf6d923a9bcce1698fd296359f7", - deprecated=True, - ) - version( - "0.14.1", - sha256="361ac3f3ec6f5a4830729ab45f96c19f0f62e9415ff681f7c6cdb4ebdb796f72", - deprecated=True, - ) - version( - "0.14", - sha256="47f99f1190dc71d6deb52a2b1831250515dbd5c9e0f263c3c8553ffc5b260dfb", - deprecated=True, - ) - version( - "0.13.2", - sha256="645f6915ca6f34789157c0a9dc8b0e9ec901e019b96eb8a68fb39011602e92eb", - deprecated=True, - ) - version( - "0.13.1", - sha256="2ae561c2a0e46c44245aa2098772374ad246c9fcb1956875c95c69c963501353", - deprecated=True, - ) - version( - "0.13", - sha256="e9cbd4e25730003d3706ad82e28b15cb5bdc524a78b0a26e90b89ea852101498", - deprecated=True, - ) - version( - "0.12", - sha256="1729a2ce21e8b307fc37dfb9a9f5ae031e9f4be4992385cf99dba3e5fdf5323a", - deprecated=True, - ) - version( - "0.11", - sha256="4b2765566a14f0ddece2c894634e0a8e4f42f3e44392addb9110d856f6267fb6", - deprecated=True, - ) - version( - "0.10", - sha256="b5b42770ec8b96bcd2748abc05669dd3e4d4cc84f81ed57d57d2eda1ade90ef2", - deprecated=True, - ) - version( - "0.9.2", - sha256="8234d1b9636029124235ef81199a1220968dcc7fdaeab81cdc96a47af332d240", - deprecated=True, - ) - version( - "0.9", - sha256="3cde67556b6b76fd2d004adfaa3b3b6173a110c0c209792bfdb5f9353e21076f", - deprecated=True, - ) - version( - "0.8", - sha256="9d035a7f5ebfae5279a17405003206853271af692f762e2bac8e73825f2af327", - deprecated=True, - ) variant( "cxxstd", @@ -157,11 +77,6 @@ class Podio(CMakePackage): variant("sio", default=False, description="Build the SIO I/O backend") variant("rntuple", default=False, description="Build the RNTuple backend") - # cpack config throws an error on some systems - patch("cpack.patch", when="@:0.10.0") - patch("dictloading.patch", when="@0.10.0") - patch("python-tests.patch", when="@:0.14.0") - depends_on("root@6.08.06: cxxstd=17", when="cxxstd=17") depends_on("root@6.28.04: +root7", when="+rntuple") depends_on("root@6.28:", when="@0.17:") @@ -171,14 +86,13 @@ class Podio(CMakePackage): depends_on("cmake@3.12:", type="build") depends_on("python", type=("build", "run")) depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-jinja2@2.10.1:", type=("build", "run"), when="@0.12.0:") + depends_on("py-jinja2@2.10.1:", type=("build", "run")) depends_on("sio", type=("build", "link"), when="+sio") - depends_on("catch2@3.0.1:", type=("test"), when="@0.13:0.16.5") + depends_on("catch2@3.0.1:", type=("test"), when="@:0.16.5") depends_on("catch2@3.1:", type=("test"), when="@0.16.6:") - depends_on("py-graphviz", type=("run"), when="@0.16.3:") + depends_on("py-graphviz", type=("run")) depends_on("py-tabulate", type=("run", "test"), when="@0.16.6:") - conflicts("+sio", when="@:0.12", msg="sio support requires at least podio@0.13") conflicts("+rntuple", when="@:0.16", msg="rntuple support requires at least podio@0.17") def cmake_args(self): @@ -193,14 +107,13 @@ class Podio(CMakePackage): def setup_run_environment(self, env): env.prepend_path("PYTHONPATH", self.prefix.python) env.prepend_path("LD_LIBRARY_PATH", self.spec["podio"].libs.directories[0]) - if "+sio" in self.spec and self.version >= Version("0.16"): + if "+sio" in self.spec: # sio needs to be on LD_LIBRARY_PATH for ROOT to be able to # dynamicaly load the python bindings library env.prepend_path("LD_LIBRARY_PATH", self.spec["sio"].libs.directories[0]) - if self.spec.satisfies("@0.16.1:"): - # Frame header needs to be available for python bindings - env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include) + # Frame header needs to be available for python bindings + env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include) def setup_dependent_build_environment(self, env, dependent_spec): env.prepend_path("PYTHONPATH", self.prefix.python) diff --git a/var/spack/repos/builtin/packages/podio/python-tests.patch b/var/spack/repos/builtin/packages/podio/python-tests.patch deleted file mode 100644 index 06d14c6e61..0000000000 --- a/var/spack/repos/builtin/packages/podio/python-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -index 5b6e13e..ac9ccf5 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -106,7 +106,7 @@ endif() - add_test( NAME pyunittest COMMAND python -m unittest discover -s ${CMAKE_SOURCE_DIR}/python) - set_property(TEST pyunittest - PROPERTY ENVIRONMENT -- LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/src:$ENV{LD_LIBRARY_PATH} -+ LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}:${CMAKE_BINARY_DIR}/src:$<TARGET_FILE_DIR:ROOT::Tree> - PYTHONPATH=${CMAKE_SOURCE_DIR}/python:$ENV{PYTHONPATH} - ROOT_INCLUDE_PATH=${CMAKE_SOURCE_DIR}/tests/datamodel:${ROOT_INCLUDE_PATH}) - set_property(TEST pyunittest PROPERTY DEPENDS write) |