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:		Mon Feb 15 12:10:00 2016 +0100
Changeset:	406d176d2ab2d8474b833d16211a6c7db4d6b42d

Modified Files:
	coreclr-git/distinfo
	coreclr-git/patches/patch-CMakeLists.txt
	coreclr-git/patches/patch-build.sh
	coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
	coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
Removed Files:
	coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt
	coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt
	coreclr-git/patches/patch-src_pal_inc_pal.h
	coreclr-git/patches/patch-src_pal_src_configure.cmake
	coreclr-git/patches/patch-src_pal_src_cruntime_misc.cpp
	coreclr-git/patches/patch-src_pal_src_include_pal_misc.h
	coreclr-git/patches/patch-src_pal_src_include_pal_palinternal.h
	coreclr-git/patches/patch-src_pal_src_misc_miscpalapi.cpp
	coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt

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=406d176d2ab2d8474b833d16211a6c7db4d6b42d

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

diffstat:
 coreclr-git/distinfo                               | 20 +++------
 coreclr-git/patches/patch-CMakeLists.txt           |  2 +-
 coreclr-git/patches/patch-build.sh                 |  2 +-
 .../patch-src_ToolBox_SOS_Strike_CMakeLists.txt    |  2 +-
 .../patches/patch-src_dlls_dbgshim_CMakeLists.txt  | 18 --------
 .../patches/patch-src_dlls_mscordac_CMakeLists.txt | 22 ----------
 .../patches/patch-src_dlls_mscordbi_CMakeLists.txt | 16 +------
 .../patch-src_dlls_mscoree_coreclr_CMakeLists.txt  | 22 ----------
 coreclr-git/patches/patch-src_pal_inc_pal.h        | 12 ------
 .../patches/patch-src_pal_src_CMakeLists.txt       |  2 +-
 .../patches/patch-src_pal_src_configure.cmake      | 29 -------------
 .../patches/patch-src_pal_src_cruntime_misc.cpp    | 35 ---------------
 .../patches/patch-src_pal_src_include_pal_misc.h   | 26 -----------
 .../patch-src_pal_src_include_pal_palinternal.h    | 12 ------
 .../patches/patch-src_pal_src_misc_miscpalapi.cpp  | 50 ----------------------
 ...ception__handling_pal__sxs_test1_CMakeLists.txt | 33 --------------
 16 files changed, 10 insertions(+), 293 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index f4175d4..76738a0 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,17 +1,7 @@
 $NetBSD$
 
-SHA1 (patch-CMakeLists.txt) = 621111492c3199019a61a3a98aa98653c6a064b7
-SHA1 (patch-build.sh) = 7335e55a0e331e899a6efe884609c06ea845c9db
-SHA1 (patch-src_ToolBox_SOS_Strike_CMakeLists.txt) = 7180a842fdf944a42354f715e98360849def355d
-SHA1 (patch-src_dlls_dbgshim_CMakeLists.txt) = 324a00675b196a5385ab9c08bf3563ef94410b3e
-SHA1 (patch-src_dlls_mscordac_CMakeLists.txt) = b6cb6eccb95906cc937528aa665ec8838bf47408
-SHA1 (patch-src_dlls_mscordbi_CMakeLists.txt) = 8f45e41ebbaf724b129b0bec434deb76692a7fd7
-SHA1 (patch-src_dlls_mscoree_coreclr_CMakeLists.txt) = 50339aa1e75d76ef1e9d24c149bc8749c2bea240
-SHA1 (patch-src_pal_inc_pal.h) = b2cf698debe62fb081ecfd54d97c3a1328f7621d
-SHA1 (patch-src_pal_src_CMakeLists.txt) = 3a20f2cf944f1f2adb9725693d8204dd1d7628d4
-SHA1 (patch-src_pal_src_configure.cmake) = 653871e6b95e78ee2812d936bce989095d348cd9
-SHA1 (patch-src_pal_src_cruntime_misc.cpp) = cbef115e6bcbd9166105b25362d7f64729676dcf
-SHA1 (patch-src_pal_src_include_pal_misc.h) = 08ebba414b6579c2ca62b04dccb78d388dd9641a
-SHA1 (patch-src_pal_src_include_pal_palinternal.h) = 9bb986f199ff3d761ae98c8df4f6c60c4ceb9261
-SHA1 (patch-src_pal_src_misc_miscpalapi.cpp) = b7a902309081c9a1a4d7a8a4dcfbb11342c7e311
-SHA1 (patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt) = c3974175fce11c46ecc60ca75b4b5959e6e79a9b
+SHA1 (patch-CMakeLists.txt) = 921b2713e8a7cf4ddcfa1fa2e028f3efa495357b
+SHA1 (patch-build.sh) = 7feac3e423fb4e3fd75f1bcdefee8a67c9c509aa
+SHA1 (patch-src_ToolBox_SOS_Strike_CMakeLists.txt) = 6344da328f268a130081a5b6f7a2f736d098612d
+SHA1 (patch-src_dlls_mscordbi_CMakeLists.txt) = 38013a29e151a949c6c1b86093c7e95435b89e57
+SHA1 (patch-src_pal_src_CMakeLists.txt) = db06bb55a6f78d8191b0005eae34732e03e38e60
diff --git a/coreclr-git/patches/patch-CMakeLists.txt b/coreclr-git/patches/patch-CMakeLists.txt
index 89fbe40..8e8b66e 100644
--- a/coreclr-git/patches/patch-CMakeLists.txt
+++ b/coreclr-git/patches/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- CMakeLists.txt.orig	2016-02-07 16:07:05.000000000 +0000
+--- CMakeLists.txt.orig	2016-02-15 11:05:55.000000000 +0000
 +++ CMakeLists.txt
 @@ -4,8 +4,12 @@ cmake_minimum_required(VERSION 2.8.12)
  # Set the project name
diff --git a/coreclr-git/patches/patch-build.sh b/coreclr-git/patches/patch-build.sh
index c10d3e6..f8410e4 100644
--- a/coreclr-git/patches/patch-build.sh
+++ b/coreclr-git/patches/patch-build.sh
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- build.sh.orig	2016-02-12 01:41:34.000000000 +0000
+--- build.sh.orig	2016-02-15 11:05:55.000000000 +0000
 +++ build.sh
 @@ -204,7 +204,7 @@ isMSBuildOnNETCoreSupported()
                      __isMSBuildOnNETCoreSupported=1
diff --git a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
index b156a19..2f6aa38 100644
--- a/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_ToolBox_SOS_Strike_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/ToolBox/SOS/Strike/CMakeLists.txt.orig	2016-02-01 23:37:48.000000000 +0000
+--- src/ToolBox/SOS/Strike/CMakeLists.txt.orig	2016-02-02 10:08:55.000000000 +0000
 +++ src/ToolBox/SOS/Strike/CMakeLists.txt
 @@ -1,10 +1,12 @@
  # Set the RPATH of sos so that it can find dependencies without needing to set LD_LIBRARY_PATH
diff --git a/coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt
deleted file mode 100644
index 856abd2..0000000
--- a/coreclr-git/patches/patch-src_dlls_dbgshim_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- src/dlls/dbgshim/CMakeLists.txt.orig	2016-01-22 10:23:14.000000000 +0000
-+++ src/dlls/dbgshim/CMakeLists.txt
-@@ -24,11 +24,11 @@ if(CLR_CMAKE_PLATFORM_UNIX)
-     add_compile_options(-fPIC)
- endif(CLR_CMAKE_PLATFORM_UNIX)
- 
--if(CLR_CMAKE_PLATFORM_LINUX)
-+if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
-     # This option is necessary to ensure that the overloaded delete operator defined inside
-     # of the utilcode will be used instead of the standard library delete operator.
-     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
--endif(CLR_CMAKE_PLATFORM_LINUX)
-+endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
- 
- add_library_clr(dbgshim SHARED ${DBGSHIM_SOURCES})
- 
diff --git a/coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt
deleted file mode 100644
index 7cee78b2..0000000
--- a/coreclr-git/patches/patch-src_dlls_mscordac_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/dlls/mscordac/CMakeLists.txt.orig	2016-01-22 10:23:14.000000000 +0000
-+++ src/dlls/mscordac/CMakeLists.txt
-@@ -30,7 +30,7 @@ if(WIN32)
-     set(START_LIBRARY_GROUP)
-     set(END_LIBRARY_GROUP)
- else(WIN32)
--    if(CLR_CMAKE_PLATFORM_LINUX)
-+    if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
-         # This option is necessary to ensure that the overloaded delete operator defined inside
-         # of the utilcode will be used instead of the standard library delete operator.
-         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
-@@ -39,7 +39,7 @@ else(WIN32)
-         # ensure proper resolving of circular references between a subset of the libraries.
-         set(START_LIBRARY_GROUP -Wl,--start-group)
-         set(END_LIBRARY_GROUP -Wl,--end-group)
--    endif(CLR_CMAKE_PLATFORM_LINUX)
-+    endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
- endif(WIN32)
- 
- add_library_clr(mscordaccore SHARED ${CLR_DAC_SOURCES})
diff --git a/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
index 97d3607..d953566 100644
--- a/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_dlls_mscordbi_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/dlls/mscordbi/CMakeLists.txt.orig	2016-01-22 10:23:14.000000000 +0000
+--- src/dlls/mscordbi/CMakeLists.txt.orig	2016-02-15 11:05:55.000000000 +0000
 +++ src/dlls/mscordbi/CMakeLists.txt
 @@ -1,11 +1,13 @@
  
@@ -19,17 +19,3 @@ $NetBSD$
  
  set(MSCORDBI_SOURCES
    mscordbi.cpp
-@@ -65,11 +67,11 @@ if(WIN32)
- 
- elseif(CLR_CMAKE_PLATFORM_UNIX)
- 
--    if(CLR_CMAKE_PLATFORM_LINUX)
-+    if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
-         # This option is necessary to ensure that the overloaded new/delete operators defined inside
-         # of the utilcode will be used instead of the standard library delete operator.
-         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")    
--    endif(CLR_CMAKE_PLATFORM_LINUX)
-+    endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD)
- 
-     list(APPEND COREDBI_LIBRARIES
-         mdhotdata_full
diff --git a/coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt b/coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt
deleted file mode 100644
index 8be9b8e..0000000
--- a/coreclr-git/patches/patch-src_dlls_mscoree_coreclr_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
---- src/dlls/mscoree/coreclr/CMakeLists.txt.orig	2016-01-31 18:28:53.000000000 +0000
-+++ src/dlls/mscoree/coreclr/CMakeLists.txt
-@@ -15,7 +15,7 @@ else()
-     set(EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/coreclr.exports)
-     generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE})
- 
--    if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+    if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-         # This option is necessary to ensure that the overloaded delete operator defined inside
-         # of the utilcode will be used instead of the standard library delete operator.
-         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
-@@ -30,7 +30,7 @@ else()
-         set(END_WHOLE_ARCHIVE -Wl,--no-whole-archive) 
- 
-         set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE})
--    endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+    endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
- 
-     if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-         # These options are used to force every object to be included even if it's unused.
diff --git a/coreclr-git/patches/patch-src_pal_inc_pal.h b/coreclr-git/patches/patch-src_pal_inc_pal.h
deleted file mode 100644
index be76f9c..0000000
--- a/coreclr-git/patches/patch-src_pal_inc_pal.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/pal/inc/pal.h.orig	2016-02-06 02:05:27.000000000 +0000
-+++ src/pal/inc/pal.h
-@@ -6027,6 +6027,7 @@ CoCreateGuid(OUT GUID * pguid);
- #define localtime     PAL_localtime
- #define mktime        PAL_mktime
- #define rand          PAL_rand
-+#define time          PAL_time
- #define getenv        PAL_getenv
- #define fgets         PAL_fgets
- #define fgetws        PAL_fgetws
diff --git a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
index 136d797..6f7aa69 100644
--- a/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
+++ b/coreclr-git/patches/patch-src_pal_src_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/pal/src/CMakeLists.txt.orig	2016-02-06 02:05:27.000000000 +0000
+--- src/pal/src/CMakeLists.txt.orig	2016-02-06 12:33:48.000000000 +0000
 +++ src/pal/src/CMakeLists.txt
 @@ -8,8 +8,10 @@ project(coreclrpal)
  
diff --git a/coreclr-git/patches/patch-src_pal_src_configure.cmake b/coreclr-git/patches/patch-src_pal_src_configure.cmake
deleted file mode 100644
index 8df46ec..0000000
--- a/coreclr-git/patches/patch-src_pal_src_configure.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- src/pal/src/configure.cmake.orig	2016-02-13 00:18:27.000000000 +0000
-+++ src/pal/src/configure.cmake
-@@ -35,7 +35,6 @@ check_include_files(libunwind.h HAVE_LIB
- check_include_files(runetype.h HAVE_RUNETYPE_H)
- check_include_files(lttng/tracepoint.h HAVE_LTTNG_TRACEPOINT_H)
- check_include_files(uuid/uuid.h HAVE_LIBUUID_H)
--check_include_files(uuid.h HAVE_BSD_UUID_H)
- 
- check_function_exists(kqueue HAVE_KQUEUE)
- check_function_exists(getpwuid_r HAVE_GETPWUID_R)
-@@ -111,6 +110,16 @@ check_cxx_symbol_exists(_SC_PHYS_PAGES u
- check_cxx_symbol_exists(_SC_AVPHYS_PAGES unistd.h HAVE__SC_AVPHYS_PAGES)
- 
- check_cxx_source_runs("
-+#include <uuid.h>
-+
-+int main(void) {
-+  uuid_t uuid;
-+  uint32_t status;
-+  uuid_create(&uuid, &status);
-+  return 0;
-+}" HAVE_BSD_UUID_H)
-+
-+check_cxx_source_runs("
- #include <sys/param.h>
- #include <stdlib.h>
- 
diff --git a/coreclr-git/patches/patch-src_pal_src_cruntime_misc.cpp b/coreclr-git/patches/patch-src_pal_src_cruntime_misc.cpp
deleted file mode 100644
index 5bac097..0000000
--- a/coreclr-git/patches/patch-src_pal_src_cruntime_misc.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
---- src/pal/src/cruntime/misc.cpp.orig	2016-02-06 02:05:27.000000000 +0000
-+++ src/pal/src/cruntime/misc.cpp
-@@ -260,6 +260,30 @@ PAL_rand(void)
- }
- 
- 
-+/*++
-+Function:
-+
-+   time
-+
-+See MSDN for more details.
-+--*/
-+PAL_time_t
-+__cdecl 
-+PAL_time(PAL_time_t *tloc)
-+{
-+    time_t result;
-+
-+    PERF_ENTRY(time);
-+    ENTRY( "time( tloc=%p )\n",tloc );
-+
-+    result = time(tloc);
-+
-+    LOGEXIT( "time returning %#lx\n",result );
-+    PERF_EXIT(time);
-+    return result;
-+}
-+
-+
- PALIMPORT 
- void __cdecl 
- PAL_qsort(void *base, size_t nmemb, size_t size, 
diff --git a/coreclr-git/patches/patch-src_pal_src_include_pal_misc.h b/coreclr-git/patches/patch-src_pal_src_include_pal_misc.h
deleted file mode 100644
index 3c0f0d6..0000000
--- a/coreclr-git/patches/patch-src_pal_src_include_pal_misc.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- src/pal/src/include/pal/misc.h.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/include/pal/misc.h
-@@ -48,6 +48,16 @@ Function :
- int __cdecl PAL_rand(void);
- 
- /*++
-+Function :
-+
-+    PAL_rand
-+    
-+    Calls rand and mitigates the difference between RAND_MAX 
-+    on Windows and FreeBSD.
-+--*/
-+PAL_time_t __cdecl PAL_time(PAL_time_t*);
-+
-+/*++
- Function:
- TIMEInitialize
- 
-@@ -128,4 +138,3 @@ void MiscUnsetenv(const char *name);
- #endif // __cplusplus
- 
- #endif /* __MISC_H_ */
--
diff --git a/coreclr-git/patches/patch-src_pal_src_include_pal_palinternal.h b/coreclr-git/patches/patch-src_pal_src_include_pal_palinternal.h
deleted file mode 100644
index ba9f52a..0000000
--- a/coreclr-git/patches/patch-src_pal_src_include_pal_palinternal.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- src/pal/src/include/pal/palinternal.h.orig	2016-02-06 02:05:27.000000000 +0000
-+++ src/pal/src/include/pal/palinternal.h
-@@ -199,7 +199,6 @@ function_name() to call the system's imp
- #define srand DUMMY_srand
- #define atoi DUMMY_atoi
- #define atof DUMMY_atof
--#define time DUMMY_time
- #define tm PAL_tm
- #define size_t DUMMY_size_t
- #define time_t PAL_time_t
diff --git a/coreclr-git/patches/patch-src_pal_src_misc_miscpalapi.cpp b/coreclr-git/patches/patch-src_pal_src_misc_miscpalapi.cpp
deleted file mode 100644
index 8690e79..0000000
--- a/coreclr-git/patches/patch-src_pal_src_misc_miscpalapi.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
---- src/pal/src/misc/miscpalapi.cpp.orig	2016-01-28 19:04:13.000000000 +0000
-+++ src/pal/src/misc/miscpalapi.cpp
-@@ -33,10 +33,10 @@ Revision History:
- #include <pthread.h>
- #include <dlfcn.h>
- 
--#if HAVE_LIBUUID_H
--#include <uuid/uuid.h>
--#elif HAVE_BSD_UUID_H
-+#if HAVE_BSD_UUID_H
- #include <uuid.h>
-+#elif HAVE_LIBUUID_H
-+#include <uuid/uuid.h>
- #endif
- 
- #include <pal_endian.h>
-@@ -352,15 +352,7 @@ HRESULT
- PALAPI
- CoCreateGuid(OUT GUID * pguid)
- {
--#if HAVE_LIBUUID_H
--    uuid_generate_random(*(uuid_t*)pguid);
--
--    // Change the byte order of the Data1, 2 and 3, since the uuid_generate_random
--    // generates them with big endian while GUIDS need to have them in little endian.
--    pguid->Data1 = SWAP32(pguid->Data1);
--    pguid->Data2 = SWAP16(pguid->Data2);
--    pguid->Data3 = SWAP16(pguid->Data3);
--#elif HAVE_BSD_UUID_H
-+#if HAVE_BSD_UUID_H
-     uuid_t uuid;
-     uint32_t status;
-     uuid_create(&uuid, &status);
-@@ -372,6 +364,14 @@ CoCreateGuid(OUT GUID * pguid)
- 
-     // Encode the uuid with little endian.
-     uuid_enc_le(pguid, &uuid);
-+#elif HAVE_LIBUUID_H
-+    uuid_generate_random(*(uuid_t*)pguid);
-+
-+    // Change the byte order of the Data1, 2 and 3, since the uuid_generate_random
-+    // generates them with big endian while GUIDS need to have them in little endian.
-+    pguid->Data1 = SWAP32(pguid->Data1);
-+    pguid->Data2 = SWAP16(pguid->Data2);
-+    pguid->Data3 = SWAP16(pguid->Data3);
- #else
-     #error Don't know how to generate UUID on this platform
- #endif
diff --git a/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt b/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt
deleted file mode 100644
index fa0084c..0000000
--- a/coreclr-git/patches/patch-src_pal_tests_palsuite_exception__handling_pal__sxs_test1_CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
---- src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt.orig	2016-01-18 21:51:39.000000000 +0000
-+++ src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt
-@@ -14,9 +14,9 @@ convert_to_absolute_path(DEF_SOURCES1 ${
- set(EXPORTS_FILE1 ${CMAKE_CURRENT_BINARY_DIR}/dlltest1.exports)
- generate_exports_file(${DEF_SOURCES1} ${EXPORTS_FILE1})
- 
--if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-     set(EXPORTS_LINKER_OPTION1 -Wl,--version-script=${EXPORTS_FILE1})
--endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
- 
- if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-     set(EXPORTS_LINKER_OPTION1 -Wl,-exported_symbols_list,${EXPORTS_FILE1})
-@@ -46,9 +46,9 @@ convert_to_absolute_path(DEF_SOURCES2 ${
- set(EXPORTS_FILE2 ${CMAKE_CURRENT_BINARY_DIR}/dlltest2.exports)
- generate_exports_file(${DEF_SOURCES2} ${EXPORTS_FILE2})
- 
--if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
-     set(EXPORTS_LINKER_OPTION2 -Wl,--version-script=${EXPORTS_FILE2})
--endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-+endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD)
- 
- if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
-     set(EXPORTS_LINKER_OPTION2 -Wl,-exported_symbols_list,${EXPORTS_FILE2})
-@@ -86,4 +86,3 @@ target_link_libraries(paltest_pal_sxs_te
-    paltest_pal_sxs_test1_dll1
-    paltest_pal_sxs_test1_dll2
- )
--
Home | Main Index | Thread Index | Old Index