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

GCC : removed dependency on libelf. Removed isl variant

Browse Source
This commit is contained in:
Massimiliano Culpo 2015-10-22 15:55:43 +02:00
parent f475ec4ce6
commit e6a44bd8ac
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/packages/gcc/package.py
View File

@ -36,6 +36,8 @@ class Gcc(Package):
list_url = 'http://open-source-box.org/gcc/' list_url = 'http://open-source-box.org/gcc/'
list_depth = 2 list_depth = 2
DEPENDS_ON_ISL_PREDICATE = '@5.0:'
version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467') version('5.2.0', 'a51bcfeb3da7dd4c623e27207ed43467')
version('4.9.3', '6f831b4d251872736e8e9cc09746f327') version('4.9.3', '6f831b4d251872736e8e9cc09746f327')
version('4.9.2', '4df8ee253b7f3863ad0b86359cd39c43') version('4.9.2', '4df8ee253b7f3863ad0b86359cd39c43')
@ -51,11 +53,10 @@ class Gcc(Package):
depends_on("mpfr") depends_on("mpfr")
depends_on("gmp") depends_on("gmp")
depends_on("mpc") # when @4.5: depends_on("mpc") # when @4.5:
depends_on("libelf")
depends_on("binutils~libiberty", when="+binutils") depends_on("binutils~libiberty", when="+binutils")
# Save these until we can do optional deps. # Save these until we can do optional deps.
depends_on("isl", when='@5.0:') depends_on("isl", when=DEPENDS_ON_ISL_PREDICATE)
#depends_on("ppl") #depends_on("ppl")
#depends_on("cloog") #depends_on("cloog")
@ -79,11 +80,6 @@ def install(self, spec, prefix):
"--with-gnu-ld", "--with-gnu-ld",
"--with-gnu-as", "--with-gnu-as",
"--with-quad"] "--with-quad"]
# Libelf
if '+libelf' in spec:
libelf_options = ["--with-libelf=%s" % spec['libelf'].prefix]
options.extend(libelf_options)
# Binutils # Binutils
if '+binutils' in spec: if '+binutils' in spec:
binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args, binutils_options = ["--with-stage1-ldflags=%s" % self.rpath_args,
@ -93,7 +89,7 @@ def install(self, spec, prefix):
options.extend(binutils_options) options.extend(binutils_options)
# Isl # Isl
if spec.satisfies('@5.0:+isl'): if spec.satisfies(Gcc.DEPENDS_ON_ISL_PREDICATE):
isl_options = ["--with-isl=%s" % spec['isl'].prefix] isl_options = ["--with-isl=%s" % spec['isl'].prefix]
options.extend(isl_options) options.extend(isl_options)