diff options
author | Leonhard Reichenbach <Zehvogel@users.noreply.github.com> | 2018-05-23 14:27:45 +0200 |
---|---|---|
committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-23 07:27:45 -0500 |
commit | ace283d594208bf9b6d4a400a4e246c31d189330 (patch) | |
tree | dcd405b9da192e40328776f61f410b22b694a1bf /var | |
parent | bc73e85af8fe4d3e4fef13fa3a1d7031a5cd9cd4 (diff) | |
download | spack-ace283d594208bf9b6d4a400a4e246c31d189330.tar.gz spack-ace283d594208bf9b6d4a400a4e246c31d189330.tar.bz2 spack-ace283d594208bf9b6d4a400a4e246c31d189330.tar.xz spack-ace283d594208bf9b6d4a400a4e246c31d189330.zip |
Add latest versions of bazel (#8250)
Diffstat (limited to 'var')
-rw-r--r-- | var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch | 124 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/bazel/package.py | 9 |
2 files changed, 130 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch new file mode 100644 index 0000000000..8f1cea0e58 --- /dev/null +++ b/var/spack/repos/builtin/packages/bazel/fix_env_handling-0.13.0.patch @@ -0,0 +1,124 @@ +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java.orig 2018-05-23 12:11:29.319402761 +0200 ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2018-05-23 12:35:21.817904301 +0200 +@@ -150,6 +150,121 @@ + builder.put("PATH", null); + builder.put("LD_LIBRARY_PATH", null); + } ++ ++ String spack_prefix = System.getenv("SPACK_PREFIX"); ++ if (spack_prefix != null) { ++ builder.put("SPACK_PREFIX", spack_prefix); ++ } ++ ++ String spack_env_path = System.getenv("SPACK_ENV_PATH"); ++ if (spack_env_path != null) { ++ builder.put("SPACK_ENV_PATH", spack_env_path); ++ } ++ ++ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID"); ++ if (spack_debug_log_id != null) { ++ builder.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id); ++ } ++ ++ String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); ++ if (spack_debug_log_dir != null) { ++ builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); ++ } ++ ++ String spack_compiler_spec = System.getenv("SPACK_COMPILER_SPEC"); ++ if (spack_compiler_spec != null) { ++ builder.put("SPACK_COMPILER_SPEC", spack_compiler_spec); ++ } ++ ++ String spack_cc_rpath_arg = System.getenv("SPACK_CC_RPATH_ARG"); ++ if (spack_cc_rpath_arg != null) { ++ builder.put("SPACK_CC_RPATH_ARG", spack_cc_rpath_arg); ++ } ++ ++ String spack_cxx_rpath_arg = System.getenv("SPACK_CXX_RPATH_ARG"); ++ if (spack_cxx_rpath_arg != null) { ++ builder.put("SPACK_CXX_RPATH_ARG", spack_cxx_rpath_arg); ++ } ++ ++ String spack_f77_rpath_arg = System.getenv("SPACK_F77_RPATH_ARG"); ++ if (spack_f77_rpath_arg != null) { ++ builder.put("SPACK_F77_RPATH_ARG", spack_f77_rpath_arg); ++ } ++ ++ String spack_fc_rpath_arg = System.getenv("SPACK_FC_RPATH_ARG"); ++ if (spack_fc_rpath_arg != null) { ++ builder.put("SPACK_FC_RPATH_ARG", spack_fc_rpath_arg); ++ } ++ ++ String spack_short_spec = System.getenv("SPACK_SHORT_SPEC"); ++ if (spack_short_spec != null) { ++ builder.put("SPACK_SHORT_SPEC", spack_short_spec); ++ } ++ ++ String spack_cc = System.getenv("SPACK_CC"); ++ if (spack_cc != null) { ++ builder.put("SPACK_CC", spack_cc); ++ } ++ ++ String spack_cxx = System.getenv("SPACK_CXX"); ++ if (spack_cxx != null) { ++ builder.put("SPACK_CXX", spack_cxx); ++ } ++ ++ String spack_f77 = System.getenv("SPACK_F77"); ++ if (spack_f77 != null) { ++ builder.put("SPACK_F77", spack_f77); ++ } ++ ++ String spack_fc = System.getenv("SPACK_FC"); ++ if (spack_fc != null) { ++ builder.put("SPACK_FC", spack_fc); ++ } ++ ++ String spack_cflags = System.getenv("SPACK_CFLAGS"); ++ if (spack_cflags != null) { ++ builder.put("SPACK_CFLAGS", spack_cflags); ++ } ++ ++ String spack_cxxflags = System.getenv("SPACK_CXXFLAGS"); ++ if (spack_cxxflags != null) { ++ builder.put("SPACK_CXXFLAGS", spack_cxxflags); ++ } ++ ++ String spack_fcflags = System.getenv("SPACK_FCFLAGS"); ++ if (spack_fcflags != null) { ++ builder.put("SPACK_FCFLAGS", spack_fcflags); ++ } ++ ++ String spack_fflags = System.getenv("SPACK_FFLAGS"); ++ if (spack_fflags != null) { ++ builder.put("SPACK_FFLAGS", spack_fflags); ++ } ++ ++ String spack_ldflags = System.getenv("SPACK_LDFLAGS"); ++ if (spack_ldflags != null) { ++ builder.put("SPACK_LDFLAGS", spack_ldflags); ++ } ++ ++ String spack_ldlibs = System.getenv("SPACK_LDLIBS"); ++ if (spack_ldlibs != null) { ++ builder.put("SPACK_LDLIBS", spack_ldlibs); ++ } ++ ++ String spack_debug = System.getenv("SPACK_DEBUG"); ++ if (spack_debug != null) { ++ builder.put("SPACK_DEBUG", spack_debug); ++ } ++ ++ String spack_test_command = System.getenv("SPACK_TEST_COMMAND"); ++ if (spack_test_command != null) { ++ builder.put("SPACK_TEST_COMMAND", spack_test_command); ++ } ++ ++ String spack_dependencies = System.getenv("SPACK_DEPENDENCIES"); ++ if (spack_dependencies != null) { ++ builder.put("SPACK_DEPENDENCIES", spack_dependencies); ++ } + } + + private static PathFragment determineShellExecutable(OS os, PathFragment fromOption) { diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index 6fd4ad731c..22f26d31b7 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -34,6 +34,8 @@ class Bazel(Package): homepage = "https://www.bazel.io" url = "https://github.com/bazelbuild/bazel/releases/download/0.11.1/bazel-0.11.1-dist.zip" + version('0.13.0', '64a5124025c1618b550faec64a9b6fa3') + version('0.12.0', 'b5d67564ceecfe2005a885fe2ffe0da3') version('0.11.1', '80daac6b100b7f8e2b17d133150eba44') version('0.11.0', 'e6caf93a805b45c33367028e575b91dd') version('0.10.1', 'a7e5b9576993b752e31bd2d3259a14c5') @@ -51,7 +53,8 @@ class Bazel(Package): depends_on('zip') patch('fix_env_handling.patch', when='@:0.4.5') - patch('fix_env_handling-0.9.0.patch', when='@0.9.0:') + patch('fix_env_handling-0.9.0.patch', when='@0.9.0:0.12.0') + patch('fix_env_handling-0.13.0.patch', when='@0.13.0:') patch('link.patch') patch('cc_configure.patch', when='@:0.4.5') patch('unix_cc_configure.patch', when='@0.9.0') @@ -88,8 +91,8 @@ class Bazel(Package): def __call__(self, *args, **kwargs): disable = env_flag(SPACK_NO_PARALLEL_MAKE) - parallel = ((not disable) and - kwargs.get('parallel', self.jobs > 1)) + parallel = ((not disable) and kwargs.get('parallel', + self.jobs > 1)) jobs = "--jobs=1" if parallel: |