diff options
| author | Paul Hopkins <paul.hopkins@ligo.org> | 2016-07-07 13:12:43 +0100 |
|---|---|---|
| committer | Paul Hopkins <paul.hopkins@ligo.org> | 2016-07-07 13:12:43 +0100 |
| commit | 8c1274bbbbc25f18bcfea4850bbf49db1b86ca47 (patch) | |
| tree | 3fb8fc90f4a9e05217e132021a2bbb82a0987b75 | |
| parent | fb6d850637fd1399232a08f27d63da318eb474d2 (diff) | |
| download | spack-8c1274bbbbc25f18bcfea4850bbf49db1b86ca47.tar.gz spack-8c1274bbbbc25f18bcfea4850bbf49db1b86ca47.tar.bz2 spack-8c1274bbbbc25f18bcfea4850bbf49db1b86ca47.tar.xz spack-8c1274bbbbc25f18bcfea4850bbf49db1b86ca47.zip | |
Fix Python configure arguments for ucs4 variant on Python 3.0 and above
| -rw-r--r-- | var/spack/repos/builtin/packages/python/package.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 524f42633a..ce5377483d 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -53,7 +53,7 @@ class Python(Package): extendable = True - variant('ucs4', default=False, description='Enable UCS4 unicode strings') + variant('ucs4', default=False, description='Enable UCS4 (wide) unicode strings') depends_on("openssl") depends_on("bzip2") @@ -91,7 +91,10 @@ class Python(Package): ] if '+ucs4' in spec: - config_args.append('--enable-unicode=ucs4') + if spec.satisfies('@:3.0'): + config_args.append('--enable-unicode=ucs4') + elif spec.satisfies('@3.0:3.2'): + config_args.append('--with-wide-unicode') if spec.satisfies('@3:'): config_args.append('--without-ensurepip') |