summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>2024-04-13 22:24:26 +0200
committerGitHub <noreply@github.com>2024-04-13 15:24:26 -0500
commite220674c4da39d73444f2a293f6db7b1245a2b9f (patch)
tree17798a85fac41182c443bcd681961f288cb10929
parent7f1351822505f3b6c227d73c1238c1f3a4ef2be1 (diff)
downloadspack-e220674c4da39d73444f2a293f6db7b1245a2b9f.tar.gz
spack-e220674c4da39d73444f2a293f6db7b1245a2b9f.tar.bz2
spack-e220674c4da39d73444f2a293f6db7b1245a2b9f.tar.xz
spack-e220674c4da39d73444f2a293f6db7b1245a2b9f.zip
sherpa: remove paths to compiler wrappers and use the provided libtool (#43611)
Co-authored-by: jmcarcell <jmcarcell@users.noreply.github.com>
-rw-r--r--var/spack/repos/builtin/packages/sherpa/package.py23
1 files changed, 19 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/sherpa/package.py b/var/spack/repos/builtin/packages/sherpa/package.py
index 5bb3470216..95a8bcfebd 100644
--- a/var/spack/repos/builtin/packages/sherpa/package.py
+++ b/var/spack/repos/builtin/packages/sherpa/package.py
@@ -159,10 +159,12 @@ class Sherpa(AutotoolsPackage):
# Note that the delphes integration seems utterly broken: https://sherpa.hepforge.org/trac/ticket/305
- depends_on("autoconf", type="build")
- depends_on("automake", type="build")
- depends_on("libtool", type="build")
- depends_on("m4", type="build")
+ # autotools dependencies are needed at runtime to compile processes
+ # at least as long as sherpa is an autotools package
+ depends_on("autoconf")
+ depends_on("automake")
+ depends_on("libtool")
+ depends_on("m4")
depends_on("texinfo", type="build")
depends_on("sqlite")
@@ -187,6 +189,8 @@ class Sherpa(AutotoolsPackage):
depends_on("hztool", when="+hztool")
# depends_on('cernlib', when='+cernlib')
+ filter_compiler_wrappers("share/SHERPA-MC/makelibs")
+
for std in _cxxstd_values:
depends_on("root cxxstd=" + std, when="+root cxxstd=" + std)
@@ -261,3 +265,14 @@ class Sherpa(AutotoolsPackage):
flags.append("-m64")
return (None, None, flags)
+
+ # This may not be needed when this package is changed to be a CMake package
+ # since it's specific to makelibs
+ def install(self, spec, prefix):
+ # Make sure the path to the provided libtool is used instead of the system one
+ filter_file(
+ r"autoreconf -fi",
+ f"autoreconf -fi -I {self.spec['libtool'].prefix.share.aclocal}",
+ "AMEGIC++/Main/makelibs",
+ )
+ make("install")