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

bazel: include SPACK_DEBUG_LOG_ID in environment (#6562)

Browse Source 
Fixes #6521.

Bazel's build system filters environment variables, including those
set by Spack for use by its compiler wrapper. This updates the patch
to include the SPACK_DEBUG_LOG_ID variable added in #5837.
This commit is contained in:
Johann Klähn 2017-12-11 19:34:06 +01:00 committed by scheibelp
parent 53b2ec356b
commit e83c3d1b6a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/bazel/fix_env_handling.patch
View File

@ -1,7 +1,7 @@
diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
--- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 11:56:01.565756979 +0200 --- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 11:56:01.565756979 +0200
+++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 12:04:13.292839801 +0200 +++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java 2016-09-14 12:04:13.292839801 +0200
@@ -92,5 +92,115 @@ public class BazelConfiguration extends @@ -92,5 +92,120 @@ public class BazelConfiguration extends
if (tmpdir != null) { if (tmpdir != null) {
builder.put("TMPDIR", tmpdir); builder.put("TMPDIR", tmpdir);
} }
@ -16,6 +16,11 @@ diff -pu bazel-0.3.1/src/main/java/com/google/devtools/build/lib/bazel/rules/Baz
+ builder.put("SPACK_ENV_PATH", spack_env_path); + 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"); + String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR");
+ if (spack_debug_log_dir != null) { + if (spack_debug_log_dir != null) {
+ builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); + builder.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir);

7
var/spack/repos/builtin/packages/bazel/link.patch
View File

@ -1,6 +1,6 @@
--- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java 2016-07-29 10:22:16.000000000 +0200 --- bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java 2016-07-29 10:22:16.000000000 +0200
+++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java 2016-10-13 15:21:35.036617890 +0200 +++ bazel-0.3.1/src/main/java/com/google/devtools/build/lib/rules/cpp/CppLinkAction.java 2016-10-13 15:21:35.036617890 +0200
@@ -214,6 +214,130 @@ @@ -214,6 +214,135 @@
.getParentDirectory() .getParentDirectory()
.getPathString()); .getPathString());
} }
@ -28,6 +28,11 @@
+ result.put("SPACK_ENV_PATH", spack_env_path); + result.put("SPACK_ENV_PATH", spack_env_path);
+ } + }
+ +
+ String spack_debug_log_id = System.getenv("SPACK_DEBUG_LOG_ID");
+ if (spack_debug_log_id != null) {
+ result.put("SPACK_DEBUG_LOG_ID", spack_debug_log_id);
+ }
+
+ String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR"); + String spack_debug_log_dir = System.getenv("SPACK_DEBUG_LOG_DIR");
+ if (spack_debug_log_dir != null) { + if (spack_debug_log_dir != null) {
+ result.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir); + result.put("SPACK_DEBUG_LOG_DIR", spack_debug_log_dir);