summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMark Olesen <Mark.Olesen@gmx.net>2017-04-07 20:06:09 +0200
committerAdam J. Stewart <ajstewart426@gmail.com>2017-04-07 13:06:09 -0500
commitf166f57f0958db6dad07d261a3517279795db813 (patch)
tree63ace9ae2536e2fefb451772385f328da607ba0e /var
parent04f20320f48283af57549d5e7703871fac54d06d (diff)
downloadspack-f166f57f0958db6dad07d261a3517279795db813.tar.gz
spack-f166f57f0958db6dad07d261a3517279795db813.tar.bz2
spack-f166f57f0958db6dad07d261a3517279795db813.tar.xz
spack-f166f57f0958db6dad07d261a3517279795db813.zip
remove mxml CFLAGS option that was breaking configure (fixes #3700) (#3706)
- provide urls for versions 2.7, 2.6, 2.5 (archive copies)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/mxml/package.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/mxml/package.py b/var/spack/repos/builtin/packages/mxml/package.py
index 435fd748b3..ef05b85da0 100644
--- a/var/spack/repos/builtin/packages/mxml/package.py
+++ b/var/spack/repos/builtin/packages/mxml/package.py
@@ -41,9 +41,12 @@ class Mxml(AutotoolsPackage):
version('2.6', '68977789ae64985dddbd1a1a1652642e')
version('2.5', 'f706377fba630b39fa02fd63642b17e5')
- # module swap PrgEnv-intel PrgEnv-$COMP
- # (Can use whatever compiler you want to use)
- # Case statement to change CC and CXX flags
+ def url_for_version(self, version):
+ if version <= Version('2.7'):
+ return 'https://github.com/michaelrsweet/mxml/archive/release-{0}.tar.gz'.format(version)
+ else:
+ return 'https://github.com/michaelrsweet/mxml/releases/download/release-{0}/mxml-{0}.tar.gz'.format(version)
def configure_args(self):
- return ['--disable-shared', 'CFLAGS=-static']
+ # Default is non-shared, but avoid any future surprises
+ return ['--disable-shared']