zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'features/cflags' into develop

Browse Source 
Conflicts:
	lib/spack/spack/cmd/find.py
	var/spack/repos/builtin/packages/ghostscript/package.py
This commit is contained in:
Todd Gamblin
2016-05-17 16:44:54 -07:00
parent 9d584d0c47 45bf93405a
commit 502420ceff
26 changed files with 710 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin.mock/packages/multimethod/package.py
View File

@@ -103,19 +103,19 @@ def has_a_default(self):
#
# Make sure we can switch methods on different architectures
#
@when('=x86_64')
@when('arch=x86_64')
def different_by_architecture(self):
return 'x86_64'
@when('=ppc64')
@when('arch=ppc64')
def different_by_architecture(self):
return 'ppc64'
@when('=ppc32')
@when('arch=ppc32')
def different_by_architecture(self):
return 'ppc32'
@when('=arm64')
@when('arch=arm64')
def different_by_architecture(self):
return 'arm64'

2
var/spack/repos/builtin/packages/boost/package.py
View File

@@ -127,7 +127,7 @@ def url_for_version(self, version):
dots, underscores)
def determine_toolset(self, spec):
if spec.satisfies("=darwin-x86_64"):
if spec.satisfies("arch=darwin-x86_64"):
return 'darwin'
toolsets = {'g++': 'gcc',

4
var/spack/repos/builtin/packages/ghostscript/package.py
View File

@@ -28,9 +28,9 @@
class Ghostscript(Package):
"""an interpreter for the PostScript language and for PDF. """
homepage = "http://ghostscript.com/"
url = "http://downloads.ghostscript.com/public/old-gs-releases/ghostscript-9.16.tar.gz"
url = "http://downloads.ghostscript.com/public/old-gs-releases/ghostscript-9.18.tar.gz"
version('9.16', '829319325bbdb83f5c81379a8f86f38f')
version('9.18', '33a47567d7a591c00a253caddd12a88a')
parallel = False

2
var/spack/repos/builtin/packages/libpciaccess/package.py
View File

@@ -37,7 +37,7 @@ class Libpciaccess(Package):
def install(self, spec, prefix):
# libpciaccess does not support OS X
if spec.satisfies('=darwin-x86_64'):
if spec.satisfies('arch=darwin-x86_64'):
# create a dummy directory
mkdir(prefix.lib)
return

2
var/spack/repos/builtin/packages/lua/package.py
View File

@@ -57,7 +57,7 @@ class Lua(Package):
placement='luarocks')
def install(self, spec, prefix):
if spec.satisfies("=darwin-i686") or spec.satisfies("=darwin-x86_64"):
if spec.satisfies("arch=darwin-i686") or spec.satisfies("arch=darwin-x86_64"):
target = 'macosx'
else:
target = 'linux'

4
var/spack/repos/builtin/packages/openssl/package.py
View File

@@ -35,7 +35,7 @@ class Openssl(Package):
Transport Layer Security (TLS v1) protocols as well as a
full-strength general purpose cryptography library."""
homepage = "http://www.openssl.org"
url = "http://www.openssl.org/source/openssl-1.0.1h.tar.gz"
url = "https://www.openssl.org/source/openssl-1.0.1h.tar.gz"
version('1.0.1h', '8d6d684a9430d5cc98a62a5d8fbda8cf')
version('1.0.1r', '1abd905e079542ccae948af37e393d28')
@@ -100,7 +100,7 @@ def install(self, spec, prefix):
# in the environment, then this will override what is set in the
# Makefile, leading to build errors.
env.pop('APPS', None)
if spec.satisfies("=darwin-x86_64") or spec.satisfies("=ppc64"):
if spec.satisfies("arch=darwin-x86_64") or spec.satisfies("arch=ppc64"):
# This needs to be done for all 64-bit architectures (except Linux,
# where it happens automatically?)
env['KERNEL_BITS'] = '64'