pkgsrc-WIP-changes archive

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

coreclr-git: Proper fix for struct tm redefinition breakage



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 19 22:13:07 2016 +0100
Changeset:	d3d91146f8070ff015622ee4a946903a5d53765d

Modified Files:
	coreclr-git/distinfo
Added Files:
	coreclr-git/patches/patch-src_debug_debug-pal_CMakeLists.txt
Removed Files:
	coreclr-git/patches/patch-src_debug_debug-pal_unix_twowaypipe.cpp
	coreclr-git/patches/patch-src_debug_debug-pal_unix_windefs.h

Log Message:
coreclr-git: Proper fix for struct tm redefinition breakage

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

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

diffstat:
 coreclr-git/distinfo                               |  3 +-
 .../patch-src_debug_debug-pal_CMakeLists.txt       | 12 +++
 .../patch-src_debug_debug-pal_unix_twowaypipe.cpp  | 97 ----------------------
 .../patch-src_debug_debug-pal_unix_windefs.h       | 17 ----
 4 files changed, 13 insertions(+), 116 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index f3f51ae..620d25a 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,7 +1,6 @@
 $NetBSD$
 
-SHA1 (patch-src_debug_debug-pal_unix_twowaypipe.cpp) = 8a5b3353b1072ba96c1350f88cc2d4bcbd235b0f
-SHA1 (patch-src_debug_debug-pal_unix_windefs.h) = 559f68e93b55d52382ecb0cf1b8730b4eff96ef2
+SHA1 (patch-src_debug_debug-pal_CMakeLists.txt) = 01708a12e46df84f9bf3005f6e4fd7b7e5a11004
 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
diff --git a/coreclr-git/patches/patch-src_debug_debug-pal_CMakeLists.txt b/coreclr-git/patches/patch-src_debug_debug-pal_CMakeLists.txt
new file mode 100644
index 0000000..5cc1134
--- /dev/null
+++ b/coreclr-git/patches/patch-src_debug_debug-pal_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/debug/debug-pal/CMakeLists.txt.orig	2016-01-18 21:51:38.000000000 +0000
++++ src/debug/debug-pal/CMakeLists.txt
+@@ -2,6 +2,7 @@
+ include_directories(../inc)
+ include_directories(../../pal/inc)
+ 
++add_definitions(-DPAL_STDCPP_COMPAT=1)
+ 
+ if(WIN32)
+     #use static crt
diff --git a/coreclr-git/patches/patch-src_debug_debug-pal_unix_twowaypipe.cpp b/coreclr-git/patches/patch-src_debug_debug-pal_unix_twowaypipe.cpp
deleted file mode 100644
index d2aa8e2..0000000
--- a/coreclr-git/patches/patch-src_debug_debug-pal_unix_twowaypipe.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-$NetBSD$
-
---- src/debug/debug-pal/unix/twowaypipe.cpp.orig	2016-02-18 21:11:19.000000000 +0000
-+++ src/debug/debug-pal/unix/twowaypipe.cpp
-@@ -2,22 +2,21 @@
- // The .NET Foundation licenses this file to you under the MIT license.
- // See the LICENSE file in the project root for more information.
- 
--#include <pal.h>
--
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <stdio.h>
- #include <limits.h>
--#include <pal_assert.h>
- 
-+#include "windefs.h"
- #include "twowaypipe.h"
- 
- #define PIPE_NAME_FORMAT_STR "/tmp/clr-debug-pipe-%d-%s"
- 
- static void GetPipeName(char *name, DWORD id, const char *suffix)
- {
--    int chars = _snprintf(name, PATH_MAX, PIPE_NAME_FORMAT_STR, id, suffix);
-+    int chars = snprintf(name, PATH_MAX, PIPE_NAME_FORMAT_STR, id, suffix);
-     _ASSERTE(chars > 0 && chars < PATH_MAX);
- }
- 
-@@ -43,14 +42,15 @@ bool TwoWayPipe::CreateServer(DWORD id)
- 
-     if (mkfifo(outPipeName, S_IRWXU) == -1)
-     {
--        unlink(inPipeName);
-+        remove(inPipeName);
-         return false;
--    }
-+    }    
- 
-     m_state = Created;
-     return true;
- }
- 
-+
- // Connects to a previously opened server side of the pipe.
- // Id is used to locate the pipe on the machine. 
- // true - success, false - failure (use GetLastError() for more details)
-@@ -138,7 +138,6 @@ int TwoWayPipe::Read(void *buffer, DWORD
-         {
-             break;
-         }
--
-         buffer = (char*)buffer + bytesRead;
-         cb -= bytesRead;
-     }
-@@ -165,7 +164,6 @@ int TwoWayPipe::Write(const void *data, 
-         {
-             break;
-         }
--
-         data = (char*)data + bytesWritten;
-         cb -= bytesWritten;
-     }
-@@ -177,6 +175,7 @@ int TwoWayPipe::Write(const void *data, 
- // true - success, false - failure (use GetLastError() for more details)
- bool TwoWayPipe::Disconnect()
- {
-+
-     if (m_outboundPipe != INVALID_PIPE && m_outboundPipe != 0)
-     {
-         close(m_outboundPipe);
-@@ -187,19 +186,21 @@ bool TwoWayPipe::Disconnect()
-     {
-         close(m_inboundPipe);
-         m_inboundPipe = INVALID_PIPE;
--    }
-+    }    
- 
-     if (m_state == ServerConnected || m_state == Created)
-     {
-+
-         char inPipeName[PATH_MAX];
-         GetPipeName(inPipeName, m_id, "in");
--        unlink(inPipeName);
-+        remove(inPipeName);
- 
-         char outPipeName[PATH_MAX];
-         GetPipeName(outPipeName, m_id, "out");
--        unlink(outPipeName);
-+        remove(outPipeName);
-     }
- 
-     m_state = NotInitialized;
-     return true;
- }
-+
diff --git a/coreclr-git/patches/patch-src_debug_debug-pal_unix_windefs.h b/coreclr-git/patches/patch-src_debug_debug-pal_unix_windefs.h
deleted file mode 100644
index d11badd..0000000
--- a/coreclr-git/patches/patch-src_debug_debug-pal_unix_windefs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
---- src/debug/debug-pal/unix/windefs.h.orig	2016-02-18 23:09:44.740731261 +0000
-+++ src/debug/debug-pal/unix/windefs.h
-@@ -0,0 +1,12 @@
-+// Licensed to the .NET Foundation under one or more agreements.
-+// The .NET Foundation licenses this file to you under the MIT license.
-+// See the LICENSE file in the project root for more information.
-+
-+// It'd be nice to be able to include some existing header from the main PAL, 
-+// but they tend to pull too much stuff that breaks everything.
-+
-+#include <cstddef>
-+#include <assert.h>
-+#define _ASSERTE assert
-+
-+typedef unsigned int DWORD;


Home | Main Index | Thread Index | Old Index