corefx-git: Fixup patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: corefx-git: Fixup patches
From: jasonwilliams200ok <necmon%yahoo.com@localhost>
Date: Mon, 08 Feb 2016 16:56:07 +0000
Module Name:	pkgsrc-wip
Committed By:	jasonwilliams200ok <necmon%yahoo.com@localhost>
Pushed By:	danglingpointer
Date:		Mon Feb 8 16:56:07 2016 +0000
Changeset:	d54e4b0c5cc33937b80b21b9dafcca6e813875da

Modified Files:
	corefx-git/distinfo
	corefx-git/patches/patch-src_Native_Common_pal__config.h.in
	corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
	corefx-git/patches/patch-src_Native_System.Native_pal__networking.cpp
	corefx-git/patches/patch-src_Native_configure.cmake

Log Message:
corefx-git: Fixup patches

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

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

diffstat:
 corefx-git/distinfo                                |  8 ++---
 .../patch-src_Native_Common_pal__config.h.in       | 15 +++-------
 .../patch-src_Native_System.Native_pal__errno.cpp  |  8 ++---
 ...ch-src_Native_System.Native_pal__networking.cpp |  2 +-
 .../patches/patch-src_Native_configure.cmake       | 34 ++++++----------------
 5 files changed, 22 insertions(+), 45 deletions(-)

diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index 89b61e5..30aaa1d 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
-SHA1 (patch-src_Native_Common_pal__config.h.in) = 31f32366dc9dbfadd6c559727cbbb972c1f7531c
-SHA1 (patch-src_Native_System.Native_pal__errno.cpp) = 80c19049b465824ebd518c367e228231f12b5022
+SHA1 (patch-src_Native_Common_pal__config.h.in) = b42af66a61b43cd682d2f54f775299990170a702
+SHA1 (patch-src_Native_System.Native_pal__errno.cpp) = 24063f42290c46ed94e6de7caef9cc0bcc676430
 SHA1 (patch-src_Native_System.Native_pal__interfaceaddresses.cpp) = 4f82e6f028fe2b9826ba6afb62869e42a0b6ee3d
 SHA1 (patch-src_Native_System.Native_pal__mount.cpp) = 7858f5ff60fcb0d60452648aef1b1034698e2c85
-SHA1 (patch-src_Native_System.Native_pal__networking.cpp) = 28eab23c604c3cd7e3488617f60c9d0cf39ca682
-SHA1 (patch-src_Native_configure.cmake) = d5b93aa7fdd07fc1da54004ce984366e0799a952
+SHA1 (patch-src_Native_System.Native_pal__networking.cpp) = 0ece22414c357580a0ea3f6f13b2325a37e4afb1
+SHA1 (patch-src_Native_configure.cmake) = c17b54e1302f17404806da0618bc7ee174f82535
 SHA1 (patch-src_Native_gen-buildsys-clang.sh) = efc34b0da3d11b1c66625336bb4d3c7ac5273b60
diff --git a/corefx-git/patches/patch-src_Native_Common_pal__config.h.in b/corefx-git/patches/patch-src_Native_Common_pal__config.h.in
index 3130e58..dded842 100644
--- a/corefx-git/patches/patch-src_Native_Common_pal__config.h.in
+++ b/corefx-git/patches/patch-src_Native_Common_pal__config.h.in
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/Native/Common/pal_config.h.in.orig	2016-02-07 13:49:29.000000000 +0000
+--- src/Native/Common/pal_config.h.in.orig	2016-02-08 16:12:54.000000000 +0000
 +++ src/Native/Common/pal_config.h.in
 @@ -7,6 +7,7 @@
  #cmakedefine01 HAVE_DIRENT_NAME_LEN
@@ -10,14 +10,7 @@ $NetBSD$
  #cmakedefine01 HAVE_STRCPY_S
  #cmakedefine01 HAVE_STRLCPY
  #cmakedefine01 HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP
-@@ -15,13 +16,18 @@
- #cmakedefine01 HAVE_IN6_U
- #cmakedefine01 HAVE_IOCTL
- #cmakedefine01 HAVE_TIOCGWINSZ
-+#cmakedefine01 HAVE_ENOTRECOVERABLE
-+#cmakedefine01 HAVE_EOWNERDEAD
- #cmakedefine01 HAVE_SCHED_GETAFFINITY
- #cmakedefine01 HAVE_SCHED_SETAFFINITY
+@@ -20,8 +21,11 @@
  #cmakedefine01 HAVE_FDS_BITS
  #cmakedefine01 HAVE_PRIVATE_FDS_BITS
  #cmakedefine01 HAVE_ALLOCA_H
@@ -28,8 +21,8 @@ $NetBSD$
 +#cmakedefine01 HAVE_GETNAMEINFO
  #cmakedefine01 HAVE_GETHOSTBYNAME_R
  #cmakedefine01 HAVE_GETHOSTBYADDR_R
- #cmakedefine01 HAVE_SUPPORT_FOR_MULTIPLE_CONNECT_ATTEMPTS
-@@ -33,6 +39,8 @@
+ #cmakedefine01 HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO
+@@ -32,6 +36,8 @@
  #cmakedefine01 HAVE_ICANON
  #cmakedefine01 HAVE_TCSANOW
  #cmakedefine01 HAVE_IN_PKTINFO
diff --git a/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp b/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
index 1ce814c..3d158f6 100644
--- a/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
+++ b/corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
@@ -6,7 +6,7 @@ $NetBSD$
              return PAL_ENOTDIR;
          case ENOTEMPTY:
              return PAL_ENOTEMPTY;
-+#if HAVE_ENOTRECOVERABLE
++#ifdef ENOTRECOVERABLE
          case ENOTRECOVERABLE:
              return PAL_ENOTRECOVERABLE;
 +#endif
@@ -17,7 +17,7 @@ $NetBSD$
              return PAL_ENXIO;
          case EOVERFLOW:
              return PAL_EOVERFLOW;
-+#if HAVE_EOWNERDEAD
++#ifdef EOWNERDEAD
          case EOWNERDEAD:
              return PAL_EOWNERDEAD;
 +#endif
@@ -28,7 +28,7 @@ $NetBSD$
          case PAL_ENOTEMPTY:
              return ENOTEMPTY;
          case PAL_ENOTRECOVERABLE:
-+#if HAVE_ENOTRECOVERABLE
++#ifdef ENOTRECOVERABLE
              return ENOTRECOVERABLE;
 +#else
 +            return -1;
@@ -40,7 +40,7 @@ $NetBSD$
          case PAL_EOVERFLOW:
              return EOVERFLOW;
          case PAL_EOWNERDEAD:
-+#if HAVE_EOWNERDEAD
++#ifdef EOWNERDEAD
              return EOWNERDEAD;
 +#else
 +            return -1;
diff --git a/corefx-git/patches/patch-src_Native_System.Native_pal__networking.cpp b/corefx-git/patches/patch-src_Native_System.Native_pal__networking.cpp
index 3fcd97a..422d957 100644
--- a/corefx-git/patches/patch-src_Native_System.Native_pal__networking.cpp
+++ b/corefx-git/patches/patch-src_Native_System.Native_pal__networking.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/Native/System.Native/pal_networking.cpp.orig	2016-02-07 13:49:29.000000000 +0000
+--- src/Native/System.Native/pal_networking.cpp.orig	2016-02-08 16:12:54.000000000 +0000
 +++ src/Native/System.Native/pal_networking.cpp
 @@ -381,7 +381,138 @@ static void ConvertHostEntPlatformToPal(
      }
diff --git a/corefx-git/patches/patch-src_Native_configure.cmake b/corefx-git/patches/patch-src_Native_configure.cmake
index 3fb8833..3152d1a 100644
--- a/corefx-git/patches/patch-src_Native_configure.cmake
+++ b/corefx-git/patches/patch-src_Native_configure.cmake
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/Native/configure.cmake.orig	2016-02-07 13:49:29.000000000 +0000
+--- src/Native/configure.cmake.orig	2016-02-08 16:12:54.000000000 +0000
 +++ src/Native/configure.cmake
 @@ -10,6 +10,7 @@ include(CheckTypeSize)
  #CMake does not include /usr/local/include into the include search path
@@ -10,20 +10,22 @@ $NetBSD$
  
  # in_pktinfo: Find whether this struct exists
  check_include_files(
-@@ -27,6 +28,12 @@ check_type_size(
+@@ -27,6 +28,14 @@ check_type_size(
      "struct in_pktinfo"
      HAVE_IN_PKTINFO
      BUILTIN_TYPES_ONLY)
++
 +check_type_size(
 +    "struct ip_mreqn"
 +    HAVE_IP_MREQN)
++
 +check_type_size(
 +    "struct ip_mreq" 
 +    HAVE_IP_MREQ)
  set(CMAKE_EXTRA_INCLUDE_FILES) # reset CMAKE_EXTRA_INCLUDE_FILES
  # /in_pktinfo
  
-@@ -34,6 +41,10 @@ check_include_files(
+@@ -34,6 +43,10 @@ check_include_files(
      alloca.h
      HAVE_ALLOCA_H)
  
@@ -34,24 +36,7 @@ $NetBSD$
  check_function_exists(
      stat64
      HAVE_STAT64)
-@@ -75,6 +86,16 @@ check_symbol_exists(
-     "sys/ioctl.h"
-     HAVE_TIOCGWINSZ)
- 
-+check_symbol_exists(
-+    ENOTRECOVERABLE
-+    "sys/errno.h"
-+    HAVE_ENOTRECOVERABLE)
-+
-+check_symbol_exists(
-+    EOWNERDEAD
-+    "sys/errno.h"
-+    HAVE_EOWNERDEAD)
-+
- check_function_exists(
-     tcgetattr
-     HAVE_TCGETATTR)
-@@ -117,6 +138,22 @@ check_struct_has_member(
+@@ -117,6 +130,21 @@ check_struct_has_member(
      HAVE_STATFS_FSTYPENAME)
  
  check_struct_has_member(
@@ -67,14 +52,13 @@ $NetBSD$
 +check_symbol_exists(
 +    VFS_NAMELEN
 +    "sys/mount.h"
-+    HAVE_VFS_NAMELEN
-+)
++    HAVE_VFS_NAMELEN)
 +
 +check_struct_has_member(
      "struct in6_addr"
      __in6_u
      "netdb.h"
-@@ -157,6 +194,18 @@ check_function_exists(
+@@ -157,6 +185,18 @@ check_function_exists(
      gethostbyaddr_r
      HAVE_GETHOSTBYADDR_R)
  
@@ -90,6 +74,6 @@ $NetBSD$
 +    getnameinfo
 +    HAVE_GETNAMEINFO)
 +
- set(HAVE_SUPPORT_FOR_MULTIPLE_CONNECT_ATTEMPTS 0)
  set(HAVE_SUPPORT_FOR_DUAL_MODE_IPV4_PACKET_INFO 0)
  set(HAVE_THREAD_SAFE_GETHOSTBYNAME_AND_GETHOSTBYADDR 0)
+
Prev by Date: coreclr-git: Add support for NetBSD FP regs
Next by Date: corefx-git: Fixup patches.
Previous by Thread: coreclr-git: Add support for NetBSD FP regs
Next by Thread: corefx-git: Fixup patches.
Indexes:
Home | Main Index | Thread Index | Old Index