hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properly wrap all long lines

Browse source
This commit is contained in:
Erik Schnetter 2016-02-12 13:11:45 -05:00
parent 77c17e1d92
commit 8e33cc1ae1
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
var/spack/repos/builtin/packages/gcc/package.py
View file

@ -50,8 +50,10 @@ class Gcc(Package):
version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4') version('4.6.4', 'b407a3d1480c11667f293bfb1f17d1a4')
version('4.5.4', '27e459c2566b8209ab064570e1b378f7') version('4.5.4', '27e459c2566b8209ab064570e1b378f7')
variant('binutils', default=sys.platform != 'darwin', description="Build via binutils") variant('binutils', default=sys.platform != 'darwin',
variant('gold', default=sys.platform != 'darwin', description="Build the gold linker plugin for ld-based LTO") description="Build via binutils")
variant('gold', default=sys.platform != 'darwin',
description="Build the gold linker plugin for ld-based LTO")
depends_on("mpfr") depends_on("mpfr")
depends_on("gmp") depends_on("gmp")
@ -66,7 +68,8 @@ class Gcc(Package):
def install(self, spec, prefix): def install(self, spec, prefix):
# libjava/configure needs a minor fix to install into spack paths. # libjava/configure needs a minor fix to install into spack paths.
filter_file(r"'@.*@'", "'@[[:alnum:]]*@'", 'libjava/configure', string=True) filter_file(r"'@.*@'", "'@[[:alnum:]]*@'", 'libjava/configure',
string=True)
enabled_languages = set(('c', 'c++', 'fortran', 'java', 'objc')) enabled_languages = set(('c', 'c++', 'fortran', 'java', 'objc'))
if spec.satisfies("@4.7.1:") and sys.platform != 'darwin': if spec.satisfies("@4.7.1:") and sys.platform != 'darwin':
@ -86,8 +89,10 @@ def install(self, spec, prefix):
if spec.satisfies('+binutils'): if spec.satisfies('+binutils'):
static_bootstrap_flags = "-static-libstdc++ -static-libgcc" static_bootstrap_flags = "-static-libstdc++ -static-libgcc"
binutils_options = ["--with-sysroot=/", binutils_options = ["--with-sysroot=/",
"--with-stage1-ldflags=%s %s" % (self.rpath_args, static_bootstrap_flags), "--with-stage1-ldflags=%s %s" %
"--with-boot-ldflags=%s %s" % (self.rpath_args, static_bootstrap_flags), (self.rpath_args, static_bootstrap_flags),
"--with-boot-ldflags=%s %s" %
(self.rpath_args, static_bootstrap_flags),
"--with-gnu-ld", "--with-gnu-ld",
"--with-ld=%s/bin/ld" % spec['binutils'].prefix, "--with-ld=%s/bin/ld" % spec['binutils'].prefix,
"--with-gnu-as", "--with-gnu-as",
@ -120,7 +125,8 @@ def write_rpath_specs(self):
"""Generate a spec file so the linker adds a rpath to the libs """Generate a spec file so the linker adds a rpath to the libs
the compiler used to build the executable.""" the compiler used to build the executable."""
if not self.spec_dir: if not self.spec_dir:
tty.warn("Could not install specs for %s." % self.spec.format('$_$@')) tty.warn("Could not install specs for %s." %
self.spec.format('$_$@'))
return return
gcc = Executable(join_path(self.prefix.bin, 'gcc')) gcc = Executable(join_path(self.prefix.bin, 'gcc'))
@ -130,5 +136,6 @@ def write_rpath_specs(self):
for line in lines: for line in lines:
out.write(line + "\n") out.write(line + "\n")
if line.startswith("*link:"): if line.startswith("*link:"):
out.write("-rpath %s/lib:%s/lib64 \\\n"% (self.prefix, self.prefix)) out.write("-rpath %s/lib:%s/lib64 \\\n" %
(self.prefix, self.prefix))
set_install_permissions(specs_file) set_install_permissions(specs_file)