Wed Feb 12 13:43:31 2020 UTC ()
mono6: Fix build on modern NetBSD with POSIX iconv(3)


(kamil)
diff -r1.5 -r1.6 pkgsrc/lang/mono6/distinfo
diff -r0 -r1.1 pkgsrc/lang/mono6/patches/patch-mono_eglib_giconv.c
cvs diff -r1.5 -r1.6 pkgsrc/lang/mono6/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/mono6/Attic/distinfo 2020/01/09 15:26:36 1.5
+++ pkgsrc/lang/mono6/Attic/distinfo 2020/02/12 13:43:31 1.6
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.5 2020/01/09 15:26:36 ryoon Exp $ 1$NetBSD: distinfo,v 1.6 2020/02/12 13:43:31 kamil Exp $
2 2
3SHA1 (mono-6.6.0.161.tar.xz) = e67eb01dc72db45bcc40169c65b54f17f64ddadb 3SHA1 (mono-6.6.0.161.tar.xz) = e67eb01dc72db45bcc40169c65b54f17f64ddadb
4RMD160 (mono-6.6.0.161.tar.xz) = 36f11f69fe7530ccf2c745fee787e48c6e737f32 4RMD160 (mono-6.6.0.161.tar.xz) = 36f11f69fe7530ccf2c745fee787e48c6e737f32
5SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186 5SHA512 (mono-6.6.0.161.tar.xz) = 0b0c72daef9e1c10c0d566292997d4a923766390793ec1196a063b885e853b47a12503238632879cf7397f03b34909137e24c53db9300a4f209164e973284186
6Size (mono-6.6.0.161.tar.xz) = 241179396 bytes 6Size (mono-6.6.0.161.tar.xz) = 241179396 bytes
7SHA1 (patch-configure.ac) = ef4a5ad6519f0333c71825b41d52c73a548c9edd 7SHA1 (patch-configure.ac) = ef4a5ad6519f0333c71825b41d52c73a548c9edd
8SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246 8SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
9SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9 9SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
10SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee 10SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
11SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883 11SHA1 (patch-data_net__4__0_Browsers_Makefile.am) = 0ada5af132816efb41dfbd7ce2ba2355d751b883
12SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606 12SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606
13SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01 13SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
14SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4 14SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
15SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 226b2638ba0106539e8ab5d9698803c6421147f0 15SHA1 (patch-mcs_class_corlib_Test_Mono_MonoNativePlatformType.cs) = 226b2638ba0106539e8ab5d9698803c6421147f0
 16SHA1 (patch-mono_eglib_giconv.c) = 04d2559d3868605194efd6267da010870f53d961
16SHA1 (patch-mono_metadata_icall.c) = b326c16e9aa8f9ee154d937128e5e09fd31b235a 17SHA1 (patch-mono_metadata_icall.c) = b326c16e9aa8f9ee154d937128e5e09fd31b235a
17SHA1 (patch-mono_metadata_mono-config.c) = 510fc7a2dde144f593ebccb0258c3753dfe5ce52 18SHA1 (patch-mono_metadata_mono-config.c) = 510fc7a2dde144f593ebccb0258c3753dfe5ce52
18SHA1 (patch-mono_metadata_threads.c) = e1432cced0dafce1a2712869ce79e12a2ab35973 19SHA1 (patch-mono_metadata_threads.c) = e1432cced0dafce1a2712869ce79e12a2ab35973
19SHA1 (patch-mono_native_Makefile.am) = 659ec73775cc90d54f41e130cc7eba75150eafbe 20SHA1 (patch-mono_native_Makefile.am) = 659ec73775cc90d54f41e130cc7eba75150eafbe
20SHA1 (patch-mono_native_mono-native-platform.h) = c3ad79f8210f797b30e3eda05ccf54f6578ecaf3 21SHA1 (patch-mono_native_mono-native-platform.h) = c3ad79f8210f797b30e3eda05ccf54f6578ecaf3
21SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca 22SHA1 (patch-mono_utils_mono-os-semaphore.h) = b850911945c95be804e9462263d558ef702831ca
22SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f 23SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f
23SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953 24SHA1 (patch-mono_utils_mono-utils-debug.c) = 30b0ab55c9227705026a8edd1e4bb693ae4f9953
24SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e 25SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e
25SHA1 (patch-support_minizip_ioapi.c) = df6c587d8cc8e2dc99e77d09411b4cc9276349cf 26SHA1 (patch-support_minizip_ioapi.c) = df6c587d8cc8e2dc99e77d09411b4cc9276349cf
File Added: pkgsrc/lang/mono6/patches/Attic/patch-mono_eglib_giconv.c
$NetBSD: patch-mono_eglib_giconv.c,v 1.1 2020/02/12 13:43:31 kamil Exp $

Support POSIX iconv(3) on modern NetBSD.

--- mono/eglib/giconv.c.orig	2019-12-10 07:50:32.000000000 +0000
+++ mono/eglib/giconv.c
@@ -37,6 +37,14 @@
 #define FORCE_INLINE(RET_TYPE) inline RET_TYPE __attribute__((always_inline))
 #endif
 
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Prereq__(9,99,17)
+#define NETBSD_POSIX_ICONV 1
+#else
+#define NETBSD_POSIX_ICONV 0
+#endif
+#endif
 
 #define UNROLL_DECODE_UTF8 0
 #define UNROLL_ENCODE_UTF8 0
@@ -196,7 +204,7 @@ g_iconv (GIConv cd, gchar **inbytes, gsi
 		} else {
 			outleftptr = NULL;
 		}
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV
 		return iconv (cd->cd, (const gchar **)inbytes, inleftptr, outbytes, outleftptr);
 #else
 		return iconv (cd->cd, inbytes, inleftptr, outbytes, outleftptr);