ports/devel/omake/files/patch-src_build_omake_rule.ml
Rene Ladan edbbdaf2a2 Ressurect devel/omake, graphics/ocaml-images and games/freetennis [1]
- devel/omake:
  - add new MASTER_SITES
  - regenerate patches [1]
- graphics/ocaml-images:
  - add missing LIB_DEPENDS
  - pet portlint
  - bump PORTREVISION
- games/freetennis:
  - add missing indirect depedencies [2]
  - bump PORTREVISION
PR:		210853 [1]
Submitted by:	lightside@gmx.com [1]
Reported by:	poudriere testport [2]
2016-07-23 14:19:05 +00:00

25 lines
1 KiB
OCaml

$NetBSD: patch-ac,v 1.1 2010/12/17 09:40:14 wiz Exp $
From upstream SVN.
--- src/build/omake_rule.ml.orig 2010-10-07 19:59:08 UTC
+++ src/build/omake_rule.ml
@@ -768,7 +768,7 @@ let lazy_command venv pos command =
let fv = free_vars_exp_list el in
CommandSection (eval_string_exp venv pos s, fv, el)
| ShellExp (loc, s) ->
- CommandValue (loc, ValStringExp (venv_get_env venv, s))
+ CommandValue (loc, venv_get_env venv, s)
| _ ->
let fv = free_vars_exp command in
CommandSection (ValData "eval", fv, [command])
@@ -1121,7 +1121,8 @@ and eval_rule venv loc target sources sl
let commands = ([], CommandEval e) :: commands in
let fv = free_vars_union fv fv' in
commands, fv
- | CommandValue (loc, v) ->
+ | CommandValue (loc, env, s) ->
+ let v = ValStringExp (env, s) in
let commands =
try
let flags, pipe = pipe_of_value venv find_alias options pos loc v in