pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

coreclr-git: Eliminate merged patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Feb 22 19:27:29 2016 +0100
Changeset:	e5edacd63fb12849d45336284a7548f62f7a7306

Modified Files:
	coreclr-git/distinfo
Removed Files:
	coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_exceptionsxs.cpp
	coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh

Log Message:
coreclr-git: Eliminate merged patches

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

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

diffstat:
 coreclr-git/distinfo                               |  2 --
 ...ption__handling_pal__sxs_test1_exceptionsxs.cpp | 13 ----------
 .../patch-src_pal_tools_gen-buildsys-clang.sh      | 28 ----------------------
 3 files changed, 43 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index b2d71d9..620d25a 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -5,5 +5,3 @@ SHA1 (patch-src_pal_inc_pal.h) = 7d3ef148af8b1b24067ba4cb5efc12581ebc6881
 SHA1 (patch-src_pal_src_cruntime_printf.cpp) = 8a86c57e1fe3953d158e1860f04bd19d7df1fe08
 SHA1 (patch-src_pal_src_cruntime_printfcpp.cpp) = 4d1ba5fea45402259c67428506f39d9c3128ecbd
 SHA1 (patch-src_pal_src_cruntime_silent__printf.cpp) = 0922321ad05a90cc3b87b1e2663ff4d0b2e4717e
-SHA1 (patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_exceptionsxs.cpp) = 174daa49b8bb21b851855e016f3c0c824b75aae0
-SHA1 (patch-src_pal_tools_gen-buildsys-clang.sh) = a495e13ad919aaeaa0963795ff9a76a2f52983fa
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_exceptionsxs.cpp b/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_exceptionsxs.cpp
deleted file mode 100644
index e31c19f..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_exceptionsxs.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp.orig	2016-02-02 01:31:09.000000000 +0000
-+++ src/pal/tests/palsuite/exception_handling/pal_sxs/test1/exceptionsxs.cpp
-@@ -20,7 +20,7 @@ extern "C" int DllTest2();
- 
- int main(int argc, char *argv[])
- {
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
-     if (0 != InitializeDllTest1())
-     {
-         return 1;
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 c97f988..0000000
--- a/coreclr-git/patches/patch-src_pal_tools_gen-buildsys-clang.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
---- src/pal/tools/gen-buildsys-clang.sh.orig	2016-02-15 22:52:17.000000000 +0000
-+++ src/pal/tools/gen-buildsys-clang.sh
-@@ -1,6 +1,6 @@
- #!/usr/bin/env bash
- #
--# This file invokes cmake and generates the build system for gcc.
-+# This file invokes cmake and generates the build system for Clang.
- #
- 
- if [ $# -lt 4 -o $# -gt 8 ]
-@@ -61,7 +61,7 @@ for i in "${@:5}"; do
-       generator=Ninja
-       ;;
-       *)
--      __UnprocessedCMakeArgs="$__UnprocessedCMakeArgs $i"
-+      __UnprocessedCMakeArgs="${__UnprocessedCMakeArgs}${__UnprocessedCMakeArgs:+ }$i"
-     esac
- done
- 
-@@ -147,5 +147,5 @@ cmake \
-   "-DCMAKE_EXPORT_COMPILE_COMMANDS=1 " \
-   "-DCLR_CMAKE_BUILD_TESTS=$build_tests" \
-   $cmake_extra_defines \
--  "$__UnprocessedCMakeArgs" \
-+  $__UnprocessedCMakeArgs \
-   "$1"


Home | Main Index | Thread Index | Old Index