-
Notifications
You must be signed in to change notification settings - Fork 195
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding patch to enable "depends-on" keyword support for tcl modulefil…
…e parsing via Lmod (#495)
- Loading branch information
Showing
2 changed files
with
30 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/src/tcl2lua.tcl b/src/tcl2lua.tcl | ||
index ffacabc0..20e80c05 100755 | ||
--- a/src/tcl2lua.tcl | ||
+++ b/src/tcl2lua.tcl | ||
@@ -543,11 +543,14 @@ proc cmdargs { cmd args } { | ||
set cmdArgs [join $cmdArgsL ","] | ||
puts stdout "$cmd\($cmdArgs\)" | ||
} | ||
+ | ||
+proc depends-on { args} { | ||
+ eval cmdargs "depends_on" $args | ||
+} | ||
proc family { var } { | ||
cmdargs "family" $var | ||
} | ||
|
||
- | ||
proc loadcmd { args } { | ||
eval cmdargs "load" $args | ||
} | ||
@@ -753,6 +756,7 @@ proc execute-modulefile {modfile } { | ||
|
||
if {![interp exists $slave]} { | ||
interp create $slave | ||
+ interp alias $slave depends-on {} depends-on | ||
interp alias $slave family {} family | ||
interp alias $slave setenv {} setenv | ||
interp alias $slave pushenv {} pushenv |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,6 +60,8 @@ Patch1: lmod.consulting.patch | |
Patch2: lmod.site.patch | ||
# 4/25/17 [email protected] - upping patch fuzz factor for newer lmod | ||
%global _default_patch_fuzz 2 | ||
# 7/27/17 [email protected] - patch to enable depends_on support for tcl modules | ||
Patch3: depends_on.patch | ||
|
||
# Known dependencies | ||
Requires: lua >= %{luaver} | ||
|