pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
corefx-git: Fixup patches.
Module Name: pkgsrc-wip
Committed By: jasonwilliams200ok <necmon%yahoo.com@localhost>
Pushed By: danglingpointer
Date: Mon Feb 8 17:25:31 2016 +0000
Changeset: c0a7f3c6f64baa71a387fa12fb099d7813a9d210
Modified Files:
corefx-git/distinfo
corefx-git/patches/patch-src_Native_System.Native_pal__errno.cpp
Added Files:
corefx-git/patches/patch-src_Native_CMakeLists.txt
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=c0a7f3c6f64baa71a387fa12fb099d7813a9d210
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
corefx-git/distinfo | 3 +-
corefx-git/patches/patch-src_Native_CMakeLists.txt | 12 ++++++
.../patch-src_Native_System.Native_pal__errno.cpp | 47 ++++++++++++++++++----
3 files changed, 53 insertions(+), 9 deletions(-)
diffs:
diff --git a/corefx-git/distinfo b/corefx-git/distinfo
index 30aaa1d..ed1c54e 100644
--- a/corefx-git/distinfo
+++ b/corefx-git/distinfo
@@ -1,6 +1,7 @@
$NetBSD$
+SHA1 (patch-src_Native_CMakeLists.txt) = 40387174f350c17df5d5b208a5b19cb2611fa733
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__errno.cpp) = 35ceb59ed13e0a3ba4007bf5e4aae375bbaed5c0
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) = 0ece22414c357580a0ea3f6f13b2325a37e4afb1
diff --git a/corefx-git/patches/patch-src_Native_CMakeLists.txt b/corefx-git/patches/patch-src_Native_CMakeLists.txt
new file mode 100644
index 0000000..b4fb813
--- /dev/null
+++ b/corefx-git/patches/patch-src_Native_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/Native/CMakeLists.txt.orig 2016-02-07 13:49:29.000000000 +0000
++++ src/Native/CMakeLists.txt
+@@ -19,6 +19,7 @@ add_compile_options(-fPIC)
+ add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
+ add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
+ add_compile_options(-Wno-c99-extensions)
++add_compile_options(-Wno-switch-enum)
+
+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5)
+ add_compile_options(-Wno-unreachable-code)
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 3d158f6..756867f 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
@@ -24,27 +24,58 @@ $NetBSD$
case EPERM:
return PAL_EPERM;
case EPIPE:
-@@ -299,7 +303,11 @@ extern "C" int32_t SystemNative_ConvertE
+@@ -298,8 +302,10 @@ extern "C" int32_t SystemNative_ConvertE
+ return ENOTDIR;
case PAL_ENOTEMPTY:
return ENOTEMPTY;
- case PAL_ENOTRECOVERABLE:
+#ifdef ENOTRECOVERABLE
+ case PAL_ENOTRECOVERABLE:
return ENOTRECOVERABLE;
-+#else
-+ return -1;
+#endif
case PAL_ENOTSOCK:
return ENOTSOCK;
case PAL_ENOTSUP:
-@@ -311,7 +319,11 @@ extern "C" int32_t SystemNative_ConvertE
+@@ -310,8 +316,10 @@ extern "C" int32_t SystemNative_ConvertE
+ return ENXIO;
case PAL_EOVERFLOW:
return EOVERFLOW;
- case PAL_EOWNERDEAD:
+#ifdef EOWNERDEAD
+ case PAL_EOWNERDEAD:
return EOWNERDEAD;
-+#else
-+ return -1;
+#endif
case PAL_EPERM:
return EPERM;
case PAL_EPIPE:
+@@ -339,20 +347,19 @@ extern "C" int32_t SystemNative_ConvertE
+ case PAL_EXDEV:
+ return EXDEV;
+ case PAL_ENONSTANDARD:
+- break; // fall through to assert
++ default:
++ // We should not use this function to round-trip platform -> pal
++ // -> platform. It's here only to synthesize a platform number
++ // from the fixed set above. Note that the assert is outside the
++ // switch rather than in a default case block because not
++ // having a default will trigger a warning (as error) if there's
++ // an enum value we haven't handled. Should that trigger, make
++ // note that there is probably a corresponding missing case in the
++ // other direction above, but the compiler can't warn in that case
++ // because the platform values are not part of an enum.
++ assert(false && "Unknown error code");
++ return -1;
+ }
+-
+- // We should not use this function to round-trip platform -> pal
+- // -> platform. It's here only to synthesize a platform number
+- // from the fixed set above. Note that the assert is outside the
+- // switch rather than in a default case block because not
+- // having a default will trigger a warning (as error) if there's
+- // an enum value we haven't handled. Should that trigger, make
+- // note that there is probably a corresponding missing case in the
+- // other direction above, but the compiler can't warn in that case
+- // because the platform values are not part of an enum.
+- assert(false && "Unknown error code");
+- return -1;
+ }
+
+ extern "C" const char* SystemNative_StrErrorR(int32_t platformErrno, char* buffer, int32_t bufferSize)
Home |
Main Index |
Thread Index |
Old Index