pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
coreclr-git: Strip package from upstreamed patches
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Fri Feb 12 02:42:50 2016 +0100
Changeset: be3037a17d1981af18351ef44d10d2fd199b9c69
Modified Files:
coreclr-git/distinfo
Removed Files:
coreclr-git/patches/patch-build.sh
coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_debugclient.h
coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_inc_dbgeng.h
coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
Log Message:
coreclr-git: Strip package from upstreamed patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=be3037a17d1981af18351ef44d10d2fd199b9c69
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
coreclr-git/distinfo | 4 --
coreclr-git/patches/patch-build.sh | 58 ----------------------
.../patch-src_ToolBox_SOS_lldbplugin_debugclient.h | 13 -----
.../patch-src_ToolBox_SOS_lldbplugin_inc_dbgeng.h | 13 -----
.../patch-src_pal_tools_gen-buildsys-clang.sh | 47 ------------------
5 files changed, 135 deletions(-)
diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 17557d7..9452030 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,11 +1,7 @@
$NetBSD$
-SHA1 (patch-build.sh) = 18610c0707583e6501a01b2c25644cbc91786d3e
-SHA1 (patch-src_ToolBox_SOS_lldbplugin_debugclient.h) = 9b0f8339c44d30ed130c9af4bd17964105c28c46
-SHA1 (patch-src_ToolBox_SOS_lldbplugin_inc_dbgeng.h) = 0f28abf96b6b7cb2c9dcb605799af2a827d0ea81
SHA1 (patch-src_debug_daccess_daccess.cpp) = ea97750ba113ff5af3a7cf8030e9f8d5fe45dc2b
SHA1 (patch-src_pal_inc_pal__char16.h) = ca743d8330802f1a626b1c335461c733eb2a6325
-SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = 81e547b9024b498bc9a003037122c71da712d240
SHA1 (patch-src_vm_amd64_externalmethodfixupthunk.S) = 5e84b369f30ea62e391e1f949d0d01e1995e5192
SHA1 (patch-src_vm_amd64_jithelpers__fast.S) = b4002abaed826b673c0af58a818c25d6b17e488e
SHA1 (patch-src_vm_amd64_pinvokestubs.S) = 344e94f87fc08edde9a61f74a495e3bd2ed11248
diff --git a/coreclr-git/patches/patch-build.sh b/coreclr-git/patches/patch-build.sh
deleted file mode 100644
index 248a982..0000000
--- a/coreclr-git/patches/patch-build.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
---- build.sh.orig 2016-02-09 05:34:42.000000000 +0000
-+++ build.sh
-@@ -1,10 +1,10 @@
--#!/usr/bin/env bash
-+#!/usr/pkg/bin/bash
-
- PYTHON=${PYTHON:-python}
-
- usage()
- {
-- echo "Usage: $0 [BuildArch] [BuildType] [clean] [verbose] [coverage] [cross] [clangx.y] [ninja] [configureonly] [skipconfigure] [skipnative] [skipmscorlib] [skiptests]"
-+ echo "Usage: $0 [BuildArch] [BuildType] [clean] [verbose] [coverage] [cross] [clangx.y] [ninja] [configureonly] [skipconfigure] [skipnative] [skipmscorlib] [skiptests] [cmakeargs]"
- echo "BuildArch can be: x64, x86, arm, arm64"
- echo "BuildType can be: Debug, Checked, Release"
- echo "clean - optional argument to force a clean build."
-@@ -19,6 +19,7 @@ usage()
- echo "skipnative - do not build native components."
- echo "skipmscorlib - do not build mscorlib.dll even if mono is installed."
- echo "skiptests - skip the tests in the 'tests' subdirectory."
-+ echo "cmakeargs - user-settable additional arguments passed to CMake."
-
- exit 1
- }
-@@ -142,8 +143,8 @@ build_coreclr()
-
- if [ $__SkipConfigure == 0 ]; then
- # Regenerate the CMake solution
-- echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion $__ClangMinorVersion $__BuildArch $__BuildType $__CodeCoverage $__IncludeTests $generator"
-- "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $__BuildArch $__BuildType $__CodeCoverage $__IncludeTests $generator
-+ echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion $__ClangMinorVersion $__BuildArch $__BuildType $__CodeCoverage $__IncludeTests $generator $__cmakeargs"
-+ "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion $__ClangMinorVersion $__BuildArch $__BuildType $__CodeCoverage $__IncludeTests $generator "$__cmakeargs"
- fi
-
- if [ $__SkipCoreCLR == 1 ]; then
-@@ -381,6 +382,7 @@ __ClangMinorVersion=5
- __MSBuildPath=$__ProjectRoot/Tools/MSBuild.exe
- __NuGetPath="$__PackagesDir/NuGet.exe"
- __DistroName=""
-+__cmakeargs=""
-
- for i in "$@"
- do
-@@ -486,6 +488,13 @@ do
- __IncludeTests=
- ;;
-
-+ cmakeargs)
-+ shift
-+ __cmakeargs="$1"
-+ echo "Mam! cmakeargs"
-+ echo "wartosc: $__cmakeargs"
-+ ;;
-+
- *)
- __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i"
- ;;
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_debugclient.h b/coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_debugclient.h
deleted file mode 100644
index 636dcaa..0000000
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_debugclient.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/ToolBox/SOS/lldbplugin/debugclient.h.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/ToolBox/SOS/lldbplugin/debugclient.h
-@@ -2,6 +2,8 @@
- // The .NET Foundation licenses this file to you under the MIT license.
- // See the LICENSE file in the project root for more information.
-
-+#include <cstdarg>
-+
- class DebugClient : public IDebugClient
- {
- private:
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_inc_dbgeng.h b/coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_inc_dbgeng.h
deleted file mode 100644
index a84bb71..0000000
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_lldbplugin_inc_dbgeng.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/ToolBox/SOS/lldbplugin/inc/dbgeng.h.orig 2016-01-28 19:04:13.000000000 +0000
-+++ src/ToolBox/SOS/lldbplugin/inc/dbgeng.h
-@@ -11,6 +11,8 @@
- #ifndef __DBGENG_H__
- #define __DBGENG_H__
-
-+#include <cstdarg>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
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
deleted file mode 100644
index 218b93c..0000000
--- a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
---- src/pal/tools/gen-buildsys-clang.sh.orig 2016-02-06 09:37:43.000000000 +0000
-+++ src/pal/tools/gen-buildsys-clang.sh
-@@ -3,16 +3,17 @@
- # This file invokes cmake and generates the build system for gcc.
- #
-
--if [ $# -lt 4 -o $# -gt 7 ]
-+if [ $# -lt 4 -o $# -gt 8 ]
- then
- echo "Usage..."
-- echo "gen-buildsys-clang.sh <path to top level CMakeLists.txt> <ClangMajorVersion> <ClangMinorVersion> <Architecture> [build flavor] [coverage] [ninja]"
-+ echo "gen-buildsys-clang.sh <path to top level CMakeLists.txt> <ClangMajorVersion> <ClangMinorVersion> <Architecture> [build flavor] [coverage] [ninja] [cmakeargs]"
- echo "Specify the path to the top level CMake file - <ProjectK>/src/NDP"
- echo "Specify the clang version to use, split into major and minor version"
- echo "Specify the target architecture."
- echo "Optionally specify the build configuration (flavor.) Defaults to DEBUG."
- echo "Optionally specify 'coverage' to enable code coverage build."
- echo "Target ninja instead of make. ninja must be on the PATH."
-+ echo "Pass additional arguments to CMake call."
- exit 1
- fi
-
-@@ -39,6 +40,7 @@ buildtype=DEBUG
- code_coverage=OFF
- build_tests=OFF
- generator="Unix Makefiles"
-+__UnprocessedCMakeArgs=""
-
- for i in "${@:5}"; do
- upperI="$(echo $i | awk '{print toupper($0)}')"
-@@ -59,7 +61,7 @@ for i in "${@:5}"; do
- generator=Ninja
- ;;
- *)
-- echo "Ignoring unknown arg '$i'"
-+ __UnprocessedCMakeArgs="$__UnprocessedCMakeArgs $i"
- esac
- done
-
-@@ -144,4 +146,5 @@ cmake \
- "-DCMAKE_ENABLE_CODE_COVERAGE=$code_coverage" \
- "-DCLR_CMAKE_BUILD_TESTS=$build_tests" \
- $cmake_extra_defines \
-+ "$__UnprocessedCMakeArgs" \
- "$1"
Home |
Main Index |
Thread Index |
Old Index