pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Try to inject CMake options via ENV
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun Feb 7 18:05:29 2016 +0100
Changeset: f826c413c1e4addd15ef3f0813d1c35a87c1d38c
Modified Files:
coreclr-git/Makefile
coreclr-git/distinfo
Added Files:
coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
Log Message:
coreclr-git: Try to inject CMake options via ENV
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f826c413c1e4addd15ef3f0813d1c35a87c1d38c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/Makefile | 10 +++++++--
coreclr-git/distinfo | 1 +
.../patch-src_pal_tools_gen-buildsys-clang.sh | 25 ++++++++++++++++++++++
3 files changed, 34 insertions(+), 2 deletions(-)
diffs:
diff --git a/coreclr-git/Makefile b/coreclr-git/Makefile
index cdb9aba..5d50c58 100644
--- a/coreclr-git/Makefile
+++ b/coreclr-git/Makefile
@@ -12,7 +12,8 @@ HOMEPAGE= https://github.com/dotnet/coreclr
COMMENT= The .NET Core runtime and the base library
LICENSE= mit
-#USE_CMAKE= yes
+# We invoke CMake through build.sh
+BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
USE_LANGUAGES= c c++
USE_TOOLS+= bash
@@ -21,7 +22,12 @@ REPLACE_BASH+= build.sh
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
do-build:
- ${RUN} cd ${WRKSRC} && PYTHON=${PYTHONBIN} ./build.sh
+ ${RUN} cd ${WRKSRC} && \
+ ${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 36a06f6..849ad61 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,3 +1,4 @@
$NetBSD$
SHA1 (patch-src_pal_inc_pal__char16.h) = ca743d8330802f1a626b1c335461c733eb2a6325
+SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 9770fa8c431354d22e9807c0be4c1136694db9c8
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
new file mode 100644
index 0000000..6dd1fa2
--- /dev/null
+++ b/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
@@ -0,0 +1,25 @@
+$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
+ 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_defined $CMAKE_ARGS_EXTRA"
++
++$cmake_extra_env cmake \
+ -G "$generator" \
+ "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/clang-compiler-override.txt" \
+ "-DCMAKE_AR=$llvm_ar" \
Home |
Main Index |
Thread Index |
Old Index