pkgsrc-WIP-changes archive

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

coreclr-git: Remove merged patches



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Jan 29 09:49:48 2016 +0100
Changeset:	fc194468da4f96b849a043ecbb0ad26d45fee41a

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-src_pal_src_configure.cmake
	coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp

Log Message:
coreclr-git: Remove merged patches

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

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

diffstat:
 coreclr-git/distinfo                                 |  4 ++--
 .../patches/patch-src_pal_src_configure.cmake        | 15 +++------------
 .../patches/patch-src_pal_src_misc_sysinfo.cpp       | 20 +++-----------------
 3 files changed, 8 insertions(+), 31 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 61b0fc4..d1a6297 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -2,9 +2,9 @@ $NetBSD$
 
 SHA1 (patch-src_pal_inc_pal__char16.h) = 46aab244c78afbef9af1fd93afafb2ed731894e6
 SHA1 (patch-src_pal_src_config.h.in) = bbf370ef53a770051ef1b64ff57e093061563828
-SHA1 (patch-src_pal_src_configure.cmake) = fc41e4af9fe7f770ae3f53fabb7a035d26541fe2
+SHA1 (patch-src_pal_src_configure.cmake) = d7f4f70c2ba17552aadbb2f1ffb8f524aeda70d2
 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_misc_sysinfo.cpp) = 5d296ac73315f080e44e5c7b9c1087b49fe9cf32
+SHA1 (patch-src_pal_src_misc_sysinfo.cpp) = 63a2a981180bd615be883ea9d53cc002306aa6b5
diff --git a/coreclr-git/patches/patch-src_pal_src_configure.cmake b/coreclr-git/patches/patch-src_pal_src_configure.cmake
index c00dfd1..0c48397 100644
--- a/coreclr-git/patches/patch-src_pal_src_configure.cmake
+++ b/coreclr-git/patches/patch-src_pal_src_configure.cmake
@@ -1,17 +1,8 @@
 $NetBSD$
 
---- src/pal/src/configure.cmake.orig	2016-01-23 16:23:38.000000000 +0000
+--- src/pal/src/configure.cmake.orig	2016-01-29 08:46:10.000000000 +0000
 +++ src/pal/src/configure.cmake
-@@ -12,7 +12,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
- elseif(CMAKE_SYSTEM_NAME STREQUAL SunOS)
-   set(CMAKE_REQUIRED_INCLUDES /opt/local/include)
- endif()
--if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin AND NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-   set(CMAKE_REQUIRED_DEFINITIONS "-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L")
- endif()
- 
-@@ -75,6 +75,7 @@ check_struct_has_member ("struct stat" s
+@@ -76,6 +76,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)
@@ -19,7 +10,7 @@ $NetBSD$
  
  set(CMAKE_EXTRA_INCLUDE_FILES machine/reg.h)
  check_type_size("struct reg" BSD_REGS_T)
-@@ -85,7 +86,7 @@ set(CMAKE_EXTRA_INCLUDE_FILES)
+@@ -86,7 +87,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_misc_sysinfo.cpp b/coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp
index 0df7eaa..f32b3d3 100644
--- a/coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp
+++ b/coreclr-git/patches/patch-src_pal_src_misc_sysinfo.cpp
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- src/pal/src/misc/sysinfo.cpp.orig	2016-01-28 19:04:13.000000000 +0000
+--- src/pal/src/misc/sysinfo.cpp.orig	2016-01-29 08:46:10.000000000 +0000
 +++ src/pal/src/misc/sysinfo.cpp
-@@ -36,6 +36,7 @@ Revision History:
+@@ -37,6 +37,7 @@ Revision History:
  #if HAVE_SYS_VMPARAM_H
  #include <sys/vmparam.h>
  #endif  // HAVE_SYS_VMPARAM_H
@@ -10,16 +10,7 @@ $NetBSD$
  
  #if HAVE_MACH_VM_TYPES_H
  #include <mach/vm_types.h>
-@@ -130,7 +131,7 @@ GetSystemInfo(
-     lpSystemInfo->dwActiveProcessorMask_PAL_Undefined = 0;
- 
- #if HAVE_SYSCONF
--#if defined(__hppa__) || ( defined (_IA64_) && defined (_HPUX_) )
-+#if ( (defined(__hppa__) || defined (_IA64_)) && defined (_HPUX_) )
-     struct pst_dynamic psd;
-     if (pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0) != -1) {
-         nrcpus = psd.psd_proc_cnt;
-@@ -139,7 +140,7 @@ GetSystemInfo(
+@@ -144,7 +145,7 @@ GetSystemInfo(
          ASSERT("pstat_getdynamic failed (%d)\n", errno);
      }
  
@@ -28,8 +19,3 @@ $NetBSD$
      nrcpus = sysconf(_SC_NPROCESSORS_ONLN);
      if (nrcpus < 1)
      {
-@@ -351,4 +352,3 @@ PAL_GetLogicalProcessorCacheSizeFromOS()
- 
-     return cacheSize;
- }
--


Home | Main Index | Thread Index | Old Index