pkgsrc-WIP-changes archive

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

coreclr-git: Sync local patches with upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Apr 16 03:24:09 2016 +0200
Changeset:	7a775540558d4fb01eac7d81157b96c0bf00f1d4

Modified Files:
	coreclr-git/distinfo
Removed Files:
	coreclr-git/patches/patch-src_coreclr_hosts_unixcoreruncommon_coreruncommon.cpp
	coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
	coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
	coreclr-git/patches/patch-src_pal_src_init_pal.cpp

Log Message:
coreclr-git: Sync local patches with upstream

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

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

diffstat:
 coreclr-git/distinfo                               |  4 --
 ...reclr_hosts_unixcoreruncommon_coreruncommon.cpp | 42 -----------------
 .../patches/patch-src_pal_src_CMakeLists.txt       | 21 ---------
 .../patches/patch-src_pal_src_cruntime_printf.cpp  | 12 -----
 coreclr-git/patches/patch-src_pal_src_init_pal.cpp | 52 ----------------------
 5 files changed, 131 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 99765b2..27ace3f 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,8 +1,4 @@
 $NetBSD$
 
-SHA1 (patch-src_coreclr_hosts_unixcoreruncommon_coreruncommon.cpp) = 146372d15f157088d450d4cd37cd2aac590e6d06
-SHA1 (patch-src_pal_src_CMakeLists.txt) = 8fc5da466e6181beaad5654faecf611498c72373
-SHA1 (patch-src_pal_src_cruntime_printf.cpp) = 42c9c2c1b619f3695330fface7d7e9b5fb8bb182
-SHA1 (patch-src_pal_src_init_pal.cpp) = feaf0e6cc704d9a11e66cc6ad3adaca6a0b01f47
 SHA1 (patch-src_pal_src_safecrt_output.inl) = ceb1951e8a7e0839fa1c0f5d07fd6c4087afd5df
 SHA1 (patch-src_pal_src_safecrt_safecrt__output__l.c) = 5a17a2525ab434336cfef369980562d1ecdcd953
diff --git a/coreclr-git/patches/patch-src_coreclr_hosts_unixcoreruncommon_coreruncommon.cpp b/coreclr-git/patches/patch-src_coreclr_hosts_unixcoreruncommon_coreruncommon.cpp
deleted file mode 100644
index d79e6fb..0000000
--- a/coreclr-git/patches/patch-src_coreclr_hosts_unixcoreruncommon_coreruncommon.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
---- src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp.orig	2016-04-08 23:29:23.000000000 +0000
-+++ src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
-@@ -16,6 +16,7 @@
- #include <string>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysctl.h>
- #include "coreruncommon.h"
- #include "coreclrhost.h"
- #include <unistd.h>
-@@ -45,7 +46,7 @@ bool GetEntrypointExecutableAbsolutePath
- 
-     // Get path to the executable for the current process using
-     // platform specific means.
--#if defined(__linux__)
-+#if defined(__linux__) || (defined(__NetBSD__) && !defined(KERN_PROC_PATHNAME))
-     // On Linux, fetch the entry point EXE absolute path, inclusive of filename.
-     char exe[PATH_MAX];
-     ssize_t res = readlink(symlinkEntrypointExecutable, exe, PATH_MAX - 1);
-@@ -75,6 +76,20 @@ bool GetEntrypointExecutableAbsolutePath
-             result = true;
-         }
-     }
-+#elif defined(__NetBSD__) && defined(KERN_PROC_PATHNAME)
-+    static const int name[] = {
-+        CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME,
-+    };
-+    char path[MAXPATHLEN];
-+    size_t len;
-+
-+    len = sizeof(path);
-+    if (sysctl(name, __arraycount(name), path, &len, NULL, 0) != -1) {
-+        entrypointExecutable.assign(path);
-+        result = true;
-+    } else {
-+        result = false;
-+    }
- #else
-     // On non-Mac OS, return the symlink that will be resolved by GetAbsolutePath
-     // to fetch the entrypoint EXE absolute path, inclusive of filename.
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
deleted file mode 100644
index 7c0fd1d..0000000
--- a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- src/pal/src/CMakeLists.txt.orig	2016-04-15 10:25:33.000000000 +0000
-+++ src/pal/src/CMakeLists.txt
-@@ -271,13 +271,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
- endif(CMAKE_SYSTEM_NAME STREQUAL Linux)
- 
- if(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-+  add_definitions(-D_KMEMUSER)
-   find_library(UNWIND unwind)
-   find_library(INTL intl)
-+  find_library(KVM kvm)
-   target_link_libraries(coreclrpal
-     pthread
-     rt
-     ${UNWIND}
-     ${INTL}
-+    ${KVM}
-   )
- endif(CMAKE_SYSTEM_NAME STREQUAL NetBSD)
- 
diff --git a/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp b/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
deleted file mode 100644
index 5904fcf..0000000
--- a/coreclr-git/patches/patch-src_pal_src_cruntime_printf.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/pal/src/cruntime/printf.cpp.orig	2016-04-15 21:21:27.000000000 +0000
-+++ src/pal/src/cruntime/printf.cpp
-@@ -45,6 +45,7 @@ static int SscanfFloatCheckExponent(LPCS
-                                       void * voidPtr, int * pn);
- #endif // SSCANF_CANNOT_HANDLE_MISSING_EXPONENT
- 
-+
- /*******************************************************************************
- Function:
-   Internal_AddPaddingA
diff --git a/coreclr-git/patches/patch-src_pal_src_init_pal.cpp b/coreclr-git/patches/patch-src_pal_src_init_pal.cpp
deleted file mode 100644
index 21fed37..0000000
--- a/coreclr-git/patches/patch-src_pal_src_init_pal.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD$
-
---- src/pal/src/init/pal.cpp.orig	2016-04-08 23:29:23.000000000 +0000
-+++ src/pal/src/init/pal.cpp
-@@ -72,6 +72,13 @@ int CacheLineSize;
- #include <mach-o/dyld.h>
- #endif // __APPLE__
- 
-+#ifdef __NetBSD__
-+#include <sys/cdefs.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <kvm.h>
-+#endif
-+
- using namespace CorUnix;
- 
- //
-@@ -706,6 +713,33 @@ PAL_IsDebuggerPresent()
-         return ((info.kp_proc.p_flag & P_TRACED) != 0);
- 
-     return FALSE;
-+#elif defined(__NetBSD__)
-+    int traced = -1;
-+    kvm_t *kd;
-+    int cnt;
-+
-+    struct kinfo_proc *info;
-+    size_t size = sizeof(info);
-+
-+    kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
-+    if (kd == NULL)
-+        goto fin;
-+
-+    info = kvm_getprocs(kd, KERN_PROC_PID, getpid(), &cnt);
-+    if (info == NULL)
-+        goto fin2;
-+
-+    traced = info->kp_proc.p_slflag & PSL_TRACED; 
-+    kvm_close(kd);
-+
-+    if (traced != 0)
-+        return TRUE;
-+    else
-+        return FALSE;
-+fin2:
-+    kvm_close(kd);
-+fin:
-+    return FALSE;
- #else
-     return FALSE;
- #endif


Home | Main Index | Thread Index | Old Index