summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvvolkl <valentin.volkl@cern.ch>2020-06-30 17:38:15 +0200
committerGitHub <noreply@github.com>2020-06-30 10:38:15 -0500
commitb9385998a8d4b9ce0ff1493c84d5ee27d40a53b9 (patch)
tree97ac781ca1725887a3ac97e1be87f529ec18f080
parentb329f10c7b22bad457c919d47d0a2cd8465ff8dc (diff)
downloadspack-b9385998a8d4b9ce0ff1493c84d5ee27d40a53b9.tar.gz
spack-b9385998a8d4b9ce0ff1493c84d5ee27d40a53b9.tar.bz2
spack-b9385998a8d4b9ce0ff1493c84d5ee27d40a53b9.tar.xz
spack-b9385998a8d4b9ce0ff1493c84d5ee27d40a53b9.zip
[whizard] Fix Runtime Compiler Paths (#17300)
* [whizard] fix runtime compilers fix * [whizard] flake8 * [whizard] add master branch
-rw-r--r--var/spack/repos/builtin/packages/whizard/package.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/whizard/package.py b/var/spack/repos/builtin/packages/whizard/package.py
index 32271f2df4..1ad8e07568 100644
--- a/var/spack/repos/builtin/packages/whizard/package.py
+++ b/var/spack/repos/builtin/packages/whizard/package.py
@@ -13,9 +13,11 @@ class Whizard(AutotoolsPackage):
homepage = "whizard.hepforge.org"
url = "https://whizard.hepforge.org/downloads/?f=whizard-2.8.2.tar.gz"
+ git = "https://gitlab.tp.nt.uni-siegen.de/whizard/public.git"
maintainers = ['vvolkl']
+ version('master', branch="master")
version('3.0.0_alpha', sha256='4636e5a10350bb67ccc98cd105bc891ea04f3393c2420f81be3d21240be20009')
version('2.8.2', sha256='32c9be342d01b3fc6f947fddce74bf2d81ece37fb39bca1f37778fb0c07e2568', prefered=True)
version('2.8.1', sha256='0c759ce0598e25f38e04659f745c5963d238c4b5c12209f16449b6c0bc6dc64e')
@@ -51,6 +53,16 @@ class Whizard(AutotoolsPackage):
depends_on('texlive', when="+latex")
depends_on('zlib')
+ def setup_build_environment(self, env):
+ # whizard uses the compiler during runtime,
+ # and seems incompatible with
+ # filter_compiler_wrappers, thus the
+ # actual compilers need to be used to build
+ env.set('CC', self.compiler.cc)
+ env.set('CXX', self.compiler.cxx)
+ env.set('FC', self.compiler.fc)
+ env.set('F77', self.compiler.fc)
+
def configure_args(self):
spec = self.spec
args = [