From 0b8faa391852e503af8e140c0071c8c7a41ad312 Mon Sep 17 00:00:00 2001 From: andriish Date: Wed, 8 May 2024 13:58:07 +0200 Subject: cernlib: add 2023.08.14.0-free (#40211) * Update CERNLIB Update CERNLIB * Update package.py * Update package.py * [@spackbot] updating style on behalf of andriish * cernlib: merge crypto->crypt patches * cernlib: depends_on xbae when `@2023:` * cernlib: patch for Xbae and Xm link order (DSO) * [@spackbot] updating style on behalf of andriish --------- Co-authored-by: Wouter Deconinck --- var/spack/repos/builtin/packages/cernlib/package.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/cernlib/package.py b/var/spack/repos/builtin/packages/cernlib/package.py index 8e69d753c7..55660d391f 100644 --- a/var/spack/repos/builtin/packages/cernlib/package.py +++ b/var/spack/repos/builtin/packages/cernlib/package.py @@ -11,14 +11,17 @@ class Cernlib(CMakePackage): """CERN Library""" homepage = "https://cernlib.web.cern.ch" - url = "https://cernlib.web.cern.ch/cernlib/download/2022_source/tar/cernlib-2022.11.08.0-free.tar.gz" + url = "https://cernlib.web.cern.ch/download/2023_source/tar/cernlib-2023.08.14.0-free.tar.gz" maintainers("andriish") - version( "2022.11.08.0-free", sha256="733d148415ef78012ff81f21922d3bf641be7514b0242348dd0200cf1b003e46", ) + version( + "2023.08.14.0-free", + sha256="7006475d9c38254cb94ce75e556a319fea3b3155087780ea522003103771474e", + ) variant("shared", default=True, description="Build shared libraries") @@ -30,11 +33,17 @@ class Cernlib(CMakePackage): depends_on("libxt") depends_on("libxcrypt") + depends_on("xbae", when="@2023:") + depends_on("openssl", when="platform=linux") - @when("@2022.11.08.0-free") def patch(self): - filter_file("crypto", "crypt", "packlib/CMakeLists.txt") + if self.spec.satisfies("@:2023.08.14.0-free"): + filter_file("crypto", "crypt", "packlib/CMakeLists.txt") + if self.spec.satisfies("@2023.08.14.0-free"): + filter_file( + r"\${MOTIF_LIBRARIES} \${Xbae}", "${Xbae} ${MOTIF_LIBRARIES}", "CMakeLists.txt" + ) def cmake_args(self): args = [self.define_from_variant("CERNLIB_BUILD_SHARED", "shared")] -- cgit v1.2.3-70-g09d2