Skip to content
Snippets Groups Projects

chore: clearly annotate all upstream package modifications

Merged Eleni Mathioulaki requested to merge align-with-upstream into master
25 files
+ 82
82
Compare changes
  • Side-by-side
  • Inline
Files
25
+ 6
3
@@ -413,8 +413,9 @@ class Bazel(Package):
@@ -413,8 +413,9 @@ class Bazel(Package):
"required for most builds using bazel with spack",
"required for most builds using bazel with spack",
)
)
# to provide ld via GCC_HOST_COMPILER_PREFIX
# begin EBRAINS (added): to provide ld via GCC_HOST_COMPILER_PREFIX
depends_on("binutils", type=("build"))
depends_on("binutils", type=("build"))
 
# end EBRAINS
# https://bazel.build/install/compile-source#bootstrap-unix-prereq
# https://bazel.build/install/compile-source#bootstrap-unix-prereq
depends_on("java", type=("build", "run"))
depends_on("java", type=("build", "run"))
@@ -439,7 +440,7 @@ class Bazel(Package):
@@ -439,7 +440,7 @@ class Bazel(Package):
patch("cc_configure-0.3.0.patch", when="@0.3:0.4")
patch("cc_configure-0.3.0.patch", when="@0.3:0.4")
# Set CC and CXX
# Set CC and CXX
# begin EBRAINS: modified, bring upstream after checking since when this is breaking the build
# begin EBRAINS (modified): bring upstream after checking since when this is breaking the build
patch("compile-0.29.patch", when="@0.29:5.3")
patch("compile-0.29.patch", when="@0.29:5.3")
# end EBRAINS
# end EBRAINS
patch("compile-0.21.patch", when="@0.21:0.28")
patch("compile-0.21.patch", when="@0.21:0.28")
@@ -514,8 +515,10 @@ class Bazel(Package):
@@ -514,8 +515,10 @@ class Bazel(Package):
return url.format(version)
return url.format(version)
 
# begin EBRAINS (added)
def setup_dependent_build_environment(self, env, dependent_spec):
def setup_dependent_build_environment(self, env, dependent_spec):
env.prepend_path("GCC_HOST_COMPILER_PREFIX", self.spec['binutils'].prefix.bin)
env.prepend_path("GCC_HOST_COMPILER_PREFIX", self.spec['binutils'].prefix.bin)
 
# end EBRAINS
def setup_build_environment(self, env):
def setup_build_environment(self, env):
# fix the broken linking (on power9)
# fix the broken linking (on power9)
@@ -529,7 +532,7 @@ class Bazel(Package):
@@ -529,7 +532,7 @@ class Bazel(Package):
"--color=no --host_javabase=@local_jdk//:jdk"
"--color=no --host_javabase=@local_jdk//:jdk"
# Enable verbose output for failures
# Enable verbose output for failures
" --verbose_failures"
" --verbose_failures"
# begin EBRAINS: modified, bring upstream after checking since when the compile-x.patch is breaking the build
# begin EBRAINS (modified): bring upstream after checking since when the compile-x.patch is breaking the build
# expose CC and CXX (the spack compiler wrappers)
# expose CC and CXX (the spack compiler wrappers)
" --action_env=CC"
" --action_env=CC"
" --action_env=CXX"
" --action_env=CXX"