pkgsrc-WIP-changes archive

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

coreclr-git: Eliminate local patches, they were merged upstream



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jan 23 17:24:44 2016 +0100
Changeset:	c52102f33b0d3dcee69f2855d1a3c1c27f2430b3

Modified Files:
	coreclr-git/distinfo
Removed Files:
	coreclr-git/patches/patch-src_pal_inc_pal.h
	coreclr-git/patches/patch-src_pal_src_configure.cmake

Log Message:
coreclr-git: Eliminate local patches, they were merged upstream

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

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

diffstat:
 coreclr-git/distinfo                               |  2 -
 coreclr-git/patches/patch-src_pal_inc_pal.h        | 50 ----------------------
 .../patches/patch-src_pal_src_configure.cmake      | 23 ----------
 3 files changed, 75 deletions(-)

diffs:
diff --git a/coreclr-git/distinfo b/coreclr-git/distinfo
index 559b539..afc7651 100644
--- a/coreclr-git/distinfo
+++ b/coreclr-git/distinfo
@@ -1,4 +1,2 @@
 $NetBSD$
 
-SHA1 (patch-src_pal_inc_pal.h) = bbe7bf6d609415ecec4993bdc3e1ec5b6f94f99a
-SHA1 (patch-src_pal_src_configure.cmake) = 2f62a889063e059dcd327072b5df21f7bab5f5a6
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 4a0016f..0000000
--- a/coreclr-git/patches/patch-src_pal_inc_pal.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD$
-
---- src/pal/inc/pal.h.orig	2016-01-21 12:20:13.000000000 +0000
-+++ src/pal/inc/pal.h
-@@ -3476,26 +3476,34 @@ PALIMPORT BOOL PALAPI PAL_VirtualUnwindO
- 
- #ifdef PLATFORM_UNIX
- 
--#if defined(__FreeBSD__) && defined(_X86_)
--#define PAL_CS_NATIVE_DATA_SIZE 12
--#elif defined(__FreeBSD__) && defined(__x86_64__)
--#define PAL_CS_NATIVE_DATA_SIZE 24
--#elif defined(__sun__)
--#define PAL_CS_NATIVE_DATA_SIZE 48
--#elif defined(__hpux__) && (defined(__hppa__) || defined (__ia64__))
--#define PAL_CS_NATIVE_DATA_SIZE 148
--#elif defined(_AIX)
-+/* PAL_CS_NATIVE_DATA_SIZE == sizeof(PAL_CRITICAL_SECTION_NATIVE_DATA) */
-+
-+#if defined(_AIX)
- #define PAL_CS_NATIVE_DATA_SIZE 100
- #elif defined(__APPLE__) && defined(__i386__)
- #define PAL_CS_NATIVE_DATA_SIZE 76
- #elif defined(__APPLE__) && defined(__x86_64__)
- #define PAL_CS_NATIVE_DATA_SIZE 120
--#elif defined(__LINUX__) && defined(__x86_64__)
--#define PAL_CS_NATIVE_DATA_SIZE 96
-+#elif defined(__FreeBSD__) && defined(_X86_)
-+#define PAL_CS_NATIVE_DATA_SIZE 12
-+#elif defined(__FreeBSD__) && defined(__x86_64__)
-+#define PAL_CS_NATIVE_DATA_SIZE 24
-+#elif defined(__hpux__) && (defined(__hppa__) || defined (__ia64__))
-+#define PAL_CS_NATIVE_DATA_SIZE 148
- #elif defined(__LINUX__) && defined(_ARM_)
- #define PAL_CS_NATIVE_DATA_SIZE 80
- #elif defined(__LINUX__) && defined(_ARM64_)
- #define PAL_CS_NATIVE_DATA_SIZE 116
-+#elif defined(__LINUX__) && defined(__x86_64__)
-+#define PAL_CS_NATIVE_DATA_SIZE 96
-+#elif defined(__NetBSD__) && defined(__amd64__)
-+#define PAL_CS_NATIVE_DATA_SIZE 96
-+#elif defined(__NetBSD__) && defined(__earm__)
-+#define PAL_CS_NATIVE_DATA_SIZE 56
-+#elif defined(__NetBSD__) && defined(__i386__)
-+#define PAL_CS_NATIVE_DATA_SIZE 56
-+#elif defined(__sun__)
-+#define PAL_CS_NATIVE_DATA_SIZE 48
- #else 
- #warning 
- #error  PAL_CS_NATIVE_DATA_SIZE is not defined for this architecture
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 a2349fd..0000000
--- a/coreclr-git/patches/patch-src_pal_src_configure.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD$
-
---- src/pal/src/configure.cmake.orig	2016-01-22 10:23:14.000000000 +0000
-+++ src/pal/src/configure.cmake
-@@ -46,7 +46,9 @@ check_library_exists(pthread pthread_get
- check_library_exists(pthread pthread_sigqueue "" HAVE_PTHREAD_SIGQUEUE)
- check_function_exists(sigreturn HAVE_SIGRETURN)
- check_function_exists(_thread_sys_sigreturn HAVE__THREAD_SYS_SIGRETURN)
-+set(CMAKE_REQUIRED_LIBRARIES m)
- check_function_exists(copysign HAVE_COPYSIGN)
-+set(CMAKE_REQUIRED_LIBRARIES)
- check_function_exists(fsync HAVE_FSYNC)
- check_function_exists(futimes HAVE_FUTIMES)
- check_function_exists(utimes HAVE_UTIMES)
-@@ -96,7 +98,7 @@ check_type_size(off_t SIZEOF_OFF_T)
- 
- check_cxx_symbol_exists(SYS_yield sys/syscall.h HAVE_YIELD_SYSCALL)
- check_cxx_symbol_exists(INFTIM poll.h HAVE_INFTIM)
--check_cxx_symbol_exists(CHAR_BIT sys/limits.h HAVE_CHAR_BIT)
-+check_cxx_symbol_exists(CHAR_BIT limits.h HAVE_CHAR_BIT)
- check_cxx_symbol_exists(_DEBUG sys/user.h USER_H_DEFINES_DEBUG)
- check_cxx_symbol_exists(_SC_PHYS_PAGES unistd.h HAVE__SC_PHYS_PAGES)
- check_cxx_symbol_exists(_SC_AVPHYS_PAGES unistd.h HAVE__SC_AVPHYS_PAGES)


Home | Main Index | Thread Index | Old Index