coreclr-git: Cleanup bash string injection (still broken)

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Feb 8 03:34:01 2016 +0100
Changeset:	3be312e662b9bdae7c5f5560289e6c227c4ad87d

Modified Files:
	coreclr-git/Makefile
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh

Log Message:
coreclr-git: Cleanup bash string injection (still broken)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3be312e662b9bdae7c5f5560289e6c227c4ad87d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 coreclr-git/Makefile                               |  2 +-
 coreclr-git/distinfo                               |  2 +-
 .../patch-src_pal_tools_gen-buildsys-clang.sh      | 25 +++++++++-------------
 3 files changed, 12 insertions(+), 17 deletions(-)

diffs:
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index e8c4cbe..4385c96 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -26,7 +26,7 @@ do-configure:
 
 do-build:
 	${RUN} cd ${WRKSRC} && \
-	CMAKE_ENV_EXTRA="${PKGSRC_SETENV} ${CONFIGURE_ENV}" CMAKE_ARGS_EXTRA="${CMAKE_ARGS}" PYTHON=${PYTHONBIN} ./build.sh
+	${PKGSRC_SETENV} CMAKE_ENV_EXTRA="${CONFIGURE_ENV}" CMAKE_ARGS_EXTRA="${CMAKE_ARGS}" PYTHON=${PYTHONBIN} ./build.sh
 
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../wip/llvm-git/buildlink3.mk"
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 0b21a92..d948a30 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,4 +1,4 @@
 $NetBSD$
 
 SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 033f48bbd9043bb1fef3f88d68680d3206548b94
+SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 5effc7914f7ca45bc084572983baa4f2ddfc9888
diff --git a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
index d73fd66..c2d04e4 100644
--- a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
+++ b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
@@ -2,24 +2,19 @@ $NetBSD$
 
 --- src/pal/tools/gen-buildsys-clang.sh.orig	2016-01-18 21:51:39.000000000 +0000
 +++ src/pal/tools/gen-buildsys-clang.sh
-@@ -3,6 +3,8 @@
- # This file invokes cmake and generates the build system for gcc.
- #
- 
-+set -x
-+
- if [ $# -lt 4 -o $# -gt 7 ]
- then
-   echo "Usage..."
-@@ -133,7 +135,10 @@ if [[ -n "$CROSSCOMPILE" ]]; then
+@@ -133,6 +133,9 @@ if [[ -n "$CROSSCOMPILE" ]]; then
      cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$1/cross/$build_arch/toolchain.cmake"
  fi
  
--cmake \
-+cmake_extra_env="$cmake_extra_env $CMAKE_ENV_EXTRA"
-+cmake_extra_defines="$cmake_extra_defines $CMAKE_ARGS_EXTRA"
++# Allow to specify additional parameters via environment variables.
 +
-+$cmake_extra_env cmake \
++$CMAKE_ENV_EXTRA \
+ cmake \
    -G "$generator" \
    "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/clang-compiler-override.txt" \
-   "-DCMAKE_AR=$llvm_ar" \
+@@ -144,4 +147,5 @@ cmake \
+   "-DCMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \
+   "-DCLR_CMAKE_BUILD_TESTS=$build_tests" \
+   $cmake_extra_defines \
++  $CMAKE_ARGS_EXTRA \
+   "$1"