pkgsrc-WIP-changes archive

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

coreclr-git: Remove merged (in a better version) patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jan 31 19:33:42 2016 +0100
Changeset:	e23023449e9f141ef7428af71ddf08cc46ab3d7a

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_src_config.h.in
	coreclr-git/patches/patch-src_pal_src_configure.cmake
	coreclr-git/patches/patch-src_pal_src_thread_context.cpp
	coreclr-git/patches/patch-src_pal_src_thread_thread.cpp

Log Message:
coreclr-git: Remove merged (in a better version) patches

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

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

diffstat:
 coreclr-git/distinfo                               |  8 ++++----
 coreclr-git/patches/patch-src_pal_src_config.h.in  | 21 ++-------------------
 .../patches/patch-src_pal_src_configure.cmake      | 22 +++-------------------
 .../patches/patch-src_pal_src_thread_context.cpp   | 17 -----------------
 .../patches/patch-src_pal_src_thread_thread.cpp    | 17 -----------------
 5 files changed, 9 insertions(+), 76 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index a102e6b..85592ab 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,12 +1,12 @@
 $NetBSD$
 
 SHA1 (patch-src_pal_inc_pal__char16.h) = 205f6a8533838c192b36bbb00155da1b02e0f629
-SHA1 (patch-src_pal_src_config.h.in) = 12da500cf1ec5ac8c448fd5cd8af9554bb235fc9
-SHA1 (patch-src_pal_src_configure.cmake) = d3e75eeaedc255297e6e0169a02d9445dbe922d5
+SHA1 (patch-src_pal_src_config.h.in) = f6caa80de0d3d3f1022bcc77e2a0cd3899efc80b
+SHA1 (patch-src_pal_src_configure.cmake) = 8a91b634878ed52b2ec73bba47cc6af00411e22f
 SHA1 (patch-src_pal_src_cruntime_file.cpp) = 315ad5db53ef2b893a77aa131ce97999214e0e11
 SHA1 (patch-src_pal_src_exception_seh-unwind.cpp) = ffb395a23d66e33e5cf1b0f3f4ff5feff52a56fc
 SHA1 (patch-src_pal_src_exception_signal.cpp) = 1bcb47f927a0c8037876b47ca4d15afb24cbd410
 SHA1 (patch-src_pal_src_include_pal_context.h) = 962cf83ef0ba0a4e2e57e344809a566f12f2e01d
 SHA1 (patch-src_pal_src_safecrt_output.inl) = 302598cb271fab7e3582dd19bf24e243f2a14879
-SHA1 (patch-src_pal_src_thread_context.cpp) = af5a6e47dc45f7f14065b02c2cdbab58bfd9d09f
-SHA1 (patch-src_pal_src_thread_thread.cpp) = 26b0dd23ffa6669db1d245ba9ec12378b46c9ad3
+SHA1 (patch-src_pal_src_thread_context.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
+SHA1 (patch-src_pal_src_thread_thread.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
diff --git a/coreclr-git/patches/patch-src_pal_src_config.h.in b/coreclr-git/patches/patch-src_pal_src_config.h.in
index 499e928..815bda0 100644
--- a/coreclr-git/patches/patch-src_pal_src_config.h.in
+++ b/coreclr-git/patches/patch-src_pal_src_config.h.in
@@ -1,25 +1,8 @@
 $NetBSD$
 
---- src/pal/src/config.h.in.orig	2016-01-31 00:59:14.000000000 +0000
+--- src/pal/src/config.h.in.orig	2016-01-31 18:28:53.000000000 +0000
 +++ src/pal/src/config.h.in
-@@ -6,6 +6,8 @@
- #cmakedefine01 HAVE_SYS_VMPARAM_H
- #cmakedefine01 HAVE_MACH_VM_TYPES_H
- #cmakedefine01 HAVE_MACH_VM_PARAM_H
-+#cmakedefine01 HAVE_MACHINE_NPX_H
-+#cmakedefine01 HAVE_MACHINE_REG_H
- #cmakedefine01 HAVE_MACHINE_VMPARAM_H
- #cmakedefine01 HAVE_PROCFS_H
- #cmakedefine01 HAVE_CRT_EXTERNS_H
-@@ -14,6 +16,7 @@
- #cmakedefine01 HAVE_SYS_LWP_H
- #cmakedefine01 HAVE_LIBUNWIND_H
- #cmakedefine01 HAVE_LIBUUID_H
-+#cmakedefine01 HAVE_LWP_H
- #cmakedefine01 HAVE_BSD_UUID_H
- #cmakedefine01 HAVE_RUNETYPE_H
- 
-@@ -58,6 +61,7 @@
+@@ -61,6 +61,7 @@
  #cmakedefine01 HAVE_BSD_REGS_T
  #cmakedefine01 HAVE_PT_REGS
  #cmakedefine01 HAVE_GREGSET_T
diff --git a/coreclr-git/patches/patch-src_pal_src_configure.cmake b/coreclr-git/patches/patch-src_pal_src_configure.cmake
index fb7a10e..57d25a8 100644
--- a/coreclr-git/patches/patch-src_pal_src_configure.cmake
+++ b/coreclr-git/patches/patch-src_pal_src_configure.cmake
@@ -1,24 +1,8 @@
 $NetBSD$
 
---- src/pal/src/configure.cmake.orig	2016-01-31 00:59:14.000000000 +0000
+--- src/pal/src/configure.cmake.orig	2016-01-31 18:28:53.000000000 +0000
 +++ src/pal/src/configure.cmake
-@@ -23,12 +23,15 @@ check_include_files(alloca.h HAVE_ALLOCA
- check_include_files(sys/vmparam.h HAVE_SYS_VMPARAM_H)
- check_include_files(mach/vm_types.h HAVE_MACH_VM_TYPES_H)
- check_include_files(mach/vm_param.h HAVE_MACH_VM_PARAM_H)
-+check_include_files(machine/npx.h HAVE_MACHINE_NPX_H)
-+check_include_files(machine/reg.h HAVE_MACHINE_REG_H)
- check_include_files(machine/vmparam.h HAVE_MACHINE_VMPARAM_H)
- check_include_files(procfs.h HAVE_PROCFS_H)
- check_include_files(crt_externs.h HAVE_CRT_EXTERNS_H)
- check_include_files(sys/time.h HAVE_SYS_TIME_H)
- check_include_files(pthread_np.h HAVE_PTHREAD_NP_H)
- check_include_files(sys/lwp.h HAVE_SYS_LWP_H)
-+check_include_files(lwp.h HAVE_LWP_H)
- check_include_files(libunwind.h HAVE_LIBUNWIND_H)
- check_include_files(runetype.h HAVE_RUNETYPE_H)
- check_include_files(lttng/tracepoint.h HAVE_LTTNG_TRACEPOINT_H)
-@@ -76,6 +79,7 @@ check_struct_has_member ("struct stat" s
+@@ -79,6 +79,7 @@ check_struct_has_member ("struct stat" s
  check_struct_has_member ("struct stat" st_atimensec "sys/types.h;sys/stat.h" HAVE_STAT_NSEC)
  check_struct_has_member ("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
  check_struct_has_member ("ucontext_t" uc_mcontext.gregs[0] ucontext.h HAVE_GREGSET_T)
@@ -26,7 +10,7 @@ $NetBSD$
  
  set(CMAKE_EXTRA_INCLUDE_FILES machine/reg.h)
  check_type_size("struct reg" BSD_REGS_T)
-@@ -86,7 +90,7 @@ set(CMAKE_EXTRA_INCLUDE_FILES)
+@@ -89,7 +90,7 @@ set(CMAKE_EXTRA_INCLUDE_FILES)
  set(CMAKE_EXTRA_INCLUDE_FILES signal.h)
  check_type_size(siginfo_t SIGINFO_T)
  set(CMAKE_EXTRA_INCLUDE_FILES)
diff --git a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp b/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
index 4bb4e9c..afc7651 100644
--- a/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_thread_context.cpp
@@ -1,19 +1,2 @@
 $NetBSD$
 
---- src/pal/src/thread/context.cpp.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/thread/context.cpp
-@@ -51,9 +51,14 @@ extern void CONTEXT_CaptureContext(LPCON
- #if !HAVE_MACH_EXCEPTIONS
- 
- #if HAVE_BSD_REGS_T
-+#if HAVE_MACHINE_REG_H
- #include <machine/reg.h>
-+#endif
-+#if HAVE_MACHINE_NPX_H
- #include <machine/npx.h>
-+#endif
- #endif  // HAVE_BSD_REGS_T
-+
- #if HAVE_PT_REGS
- #include <asm/ptrace.h>
- #endif  // HAVE_PT_REGS
diff --git a/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp b/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
index b1cdccf..afc7651 100644
--- a/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_thread_thread.cpp
@@ -1,19 +1,2 @@
 $NetBSD$
 
---- src/pal/src/thread/thread.cpp.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/thread/thread.cpp
-@@ -53,8 +53,12 @@ Abstract:
- #include <limits.h>
- #if HAVE_SYS_LWP_H
- #include <sys/lwp.h>
--// If we don't have sys/lwp.h but do expect to use _lwp_self, declare it to silence compiler warnings
--#elif HAVE__LWP_SELF
-+#endif
-+#if HAVE_LWP_H
-+#include <lwp.h>
-+#endif
-+// If we don't have lwp.h, sys/lwp.h but do expect to use _lwp_self, declare it to silence compiler warnings
-+#if !HAVE_SYS_LWP_H && !HAVE_LWP_H && HAVE__LWP_SELF
- extern "C" int _lwp_self ();
- #endif // HAVE_LWP_H
- 


Home | Main Index | Thread Index | Old Index