pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/mono lang/mono: Fix network interfaces and enable...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e54abe00b5de
branches: trunk
changeset: 373213:e54abe00b5de
user: gavan <gavan%pkgsrc.org@localhost>
date: Tue Feb 08 13:39:17 2022 +0000
description:
lang/mono: Fix network interfaces and enable BTLS
diffstat:
lang/mono/Makefile | 6 +-
lang/mono/PLIST | 6 +-
lang/mono/distinfo | 7 +-
lang/mono/patches/patch-configure.ac | 22 +++++
lang/mono/patches/patch-external_boringssl_include_openssl_thread.h | 14 +++
lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_UnixNetworkInterfaceFactory.cs | 13 +++
lang/mono/patches/patch-mcs_class_System_System_Platform.cs | 37 ++++++++++
lang/mono/patches/patch-msvc_mono.props | 13 +++
8 files changed, 112 insertions(+), 6 deletions(-)
diffs (210 lines):
diff -r a6397642f54c -r e54abe00b5de lang/mono/Makefile
--- a/lang/mono/Makefile Tue Feb 08 13:15:54 2022 +0000
+++ b/lang/mono/Makefile Tue Feb 08 13:39:17 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.200 2021/12/08 16:02:16 adam Exp $
+# $NetBSD: Makefile,v 1.201 2022/02/08 13:39:17 gavan Exp $
DISTNAME= mono-6.12.0.122
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= lang
MASTER_SITES= https://download.mono-project.com/sources/mono/
EXTRACT_SUFX= .tar.xz
@@ -27,8 +27,6 @@
GNU_CONFIGURE= yes
GNU_CONFIGURE_STRICT= no # has sub-configures
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --disable-btls
-CONFIGURE_ARGS+= --disable-btls-lib
# Requires a cwrappers change: http://mail-index.netbsd.org/tech-pkg/2019/08/16/msg021791.html
USE_CWRAPPERS= no
diff -r a6397642f54c -r e54abe00b5de lang/mono/PLIST
--- a/lang/mono/PLIST Tue Feb 08 13:15:54 2022 +0000
+++ b/lang/mono/PLIST Tue Feb 08 13:39:17 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2021/03/06 09:37:52 nia Exp $
+@comment $NetBSD: PLIST,v 1.29 2022/02/08 13:39:17 gavan Exp $
bin/al
bin/al2
bin/aprofutil
@@ -135,6 +135,7 @@
lib/libmono-2.0.so.1
lib/libmono-2.0.so.1.0.0
lib/libmono-native.la
+lib/libmono-btls-shared.so
lib/libmono-profiler-aot-static.la
lib/libmono-profiler-aot.la
lib/libmono-profiler-coverage-static.la
@@ -1098,6 +1099,7 @@
lib/mono/4.5/Microsoft.VisualBasic.targets
lib/mono/4.5/Microsoft.VisualC.dll
lib/mono/4.5/Microsoft.Web.Infrastructure.dll
+lib/mono/4.5/Mono.Btls.Interface.dll
lib/mono/4.5/Mono.CSharp.dll
lib/mono/4.5/Mono.Cairo.dll
lib/mono/4.5/Mono.CodeContracts.dll
@@ -2908,6 +2910,8 @@
lib/mono/gac/Microsoft.VisualC/10.0.0.0__b03f5f7f11d50a3a/Microsoft.VisualC.pdb
lib/mono/gac/Microsoft.Web.Infrastructure/1.0.0.0__31bf3856ad364e35/Microsoft.Web.Infrastructure.dll
lib/mono/gac/Microsoft.Web.Infrastructure/1.0.0.0__31bf3856ad364e35/Microsoft.Web.Infrastructure.pdb
+lib/mono/gac/Mono.Btls.Interface/4.0.0.0__0738eb9f132ed756/Mono.Btls.Interface.dll
+lib/mono/gac/Mono.Btls.Interface/4.0.0.0__0738eb9f132ed756/Mono.Btls.Interface.pdb
lib/mono/gac/Mono.CSharp/4.0.0.0__0738eb9f132ed756/Mono.CSharp.dll
lib/mono/gac/Mono.CSharp/4.0.0.0__0738eb9f132ed756/Mono.CSharp.pdb
lib/mono/gac/Mono.Cairo/4.0.0.0__0738eb9f132ed756/Mono.Cairo.dll
diff -r a6397642f54c -r e54abe00b5de lang/mono/distinfo
--- a/lang/mono/distinfo Tue Feb 08 13:15:54 2022 +0000
+++ b/lang/mono/distinfo Tue Feb 08 13:39:17 2022 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.115 2021/10/26 10:51:43 nia Exp $
+$NetBSD: distinfo,v 1.116 2022/02/08 13:39:17 gavan Exp $
BLAKE2s (mono-6.12.0.122.tar.xz) = 0f4ef4106e8974fea9ddc2b61ab1b0ebd2a8182fb9f098ec9c46655b4ac1b867
SHA512 (mono-6.12.0.122.tar.xz) = 0fbd4147498cc81e384933147eb6aa5c559d17a794a308af7ffa43dce51e0faefde24fc75e987ed804dcb161b52756944bc3611100fc0a4adcc260ca97ddaecd
Size (mono-6.12.0.122.tar.xz) = 292266176 bytes
SHA1 (patch-acceptance-tests_Makefile.in) = b2edf3ed54d3669c5651c6d63bb8fb04fae0fec0
SHA1 (patch-acceptance-tests_microbench-perf_sh_in) = d46118c1685e3e48a5b8594bf7f77acd2bebaf94
+SHA1 (patch-configure.ac) = b43ae23e74790660435eb13ac358dc56ad243779
SHA1 (patch-data_Makefile.am) = 535480855e413750d5b6cab6351b1683ac911246
SHA1 (patch-data_net__2__0_Browsers_Makefile.am) = 847fa7f5a54e7583a87c40749efe5a99e513c3c9
SHA1 (patch-data_net__2__0_Makefile.am) = dffb23423381a9031587536ee5de2b34610329ee
@@ -12,7 +13,10 @@
SHA1 (patch-data_net__4__0_Makefile.am) = 7c0fa175047f01a556f61503b2fcfabdedd2c606
SHA1 (patch-data_net__4__5_Browsers_Makefile.am) = 80bd57a2ac3fc95adef18acd9cfd7744ca112b01
SHA1 (patch-data_net__4__5_Makefile.am) = d7591e835bfdd27fa0fba4b669b778924c811be4
+SHA1 (patch-external_boringssl_include_openssl_thread.h) = a0855fa36e98111961e58338e7c810c5e0568bfb
SHA1 (patch-external_corert_src_Native_gc_env_gcenv.structs.h) = 91b37d93c1c3aadcdb383c443142fe28f50ad8e6
+SHA1 (patch-mcs_class_System_System.Net.NetworkInformation_UnixNetworkInterfaceFactory.cs) = 90cb31154f325c19ae82a9e7dd52b4de0ee7b2d2
+SHA1 (patch-mcs_class_System_System_Platform.cs) = ef773547c0f27738319e1c9d4c8624185456ee0c
SHA1 (patch-mono_eglib_giconv.c) = 5c2ca5788b93d371d1aa30f296a447516b622a4e
SHA1 (patch-mono_metadata_icall.c) = 9c0ec3d4d3263943a7351a76065ef80ce312396a
SHA1 (patch-mono_metadata_w32mutex-unix.c) = c3d424fe4ae1079c9c664c876a087fb0134f2e22
@@ -25,6 +29,7 @@
SHA1 (patch-mono_utils_mono-sigcontext.h) = b8a6f886661622e9b0d382443536bd3dc998f95f
SHA1 (patch-mono_utils_mono-threads-posix.c) = 3111d6a47fa104d964b34fdb5f7eca8643559ea3
SHA1 (patch-mono_utils_mono-utils-debug.c) = 39f099969040b3a52101b611be723b25674ea68b
+SHA1 (patch-msvc_mono.props) = 0ffb74104049e763d28a2c7a17433b35ffb4cf3b
SHA1 (patch-runtime_mono-wrapper.in) = ea40d2f2e8b67de0ae42c6e608e3c085dc2b040e
SHA1 (patch-scripts_submodules_versions.mk) = ca45d582a09af1bb3a1031a689c188605dea91b8
SHA1 (patch-support_minizip_ioapi.c) = 605c86916c957c31a8b3048d7703482f8f545463
diff -r a6397642f54c -r e54abe00b5de lang/mono/patches/patch-configure.ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-configure.ac Tue Feb 08 13:39:17 2022 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-configure.ac,v 1.1 2022/02/08 13:39:17 gavan Exp $
+
+--- configure.ac.orig 2021-02-22 15:58:24.000000000 +0000
++++ configure.ac
+@@ -4405,7 +4405,7 @@ case "$host" in
+ BTLS_SUPPORTED=yes
+ BTLS_PLATFORM=i386
+ ;;
+- openbsd*|freebsd*|kfreebsd-gnu*)
++ openbsd*|freebsd*|kfreebsd-gnu*|netbsd*)
+ AOT_SUPPORTED="yes"
+ BTLS_SUPPORTED=yes
+ BTLS_PLATFORM=i386
+@@ -4432,7 +4432,7 @@ case "$host" in
+ BTLS_PLATFORM=x86_64
+ boehm_supported=false
+ ;;
+- openbsd*|freebsd*|kfreebsd-gnu*)
++ openbsd*|freebsd*|kfreebsd-gnu*|netbsd*)
+ AOT_SUPPORTED="yes"
+ BTLS_SUPPORTED=yes
+ BTLS_PLATFORM=x86_64
diff -r a6397642f54c -r e54abe00b5de lang/mono/patches/patch-external_boringssl_include_openssl_thread.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-external_boringssl_include_openssl_thread.h Tue Feb 08 13:39:17 2022 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-external_boringssl_include_openssl_thread.h,v 1.1 2022/02/08 13:39:17 gavan Exp $
+
+--- external/boringssl/include/openssl/thread.h.orig 2021-02-22 15:51:10.000000000 +0000
++++ external/boringssl/include/openssl/thread.h
+@@ -88,6 +88,9 @@ typedef pthread_rwlock_t CRYPTO_MUTEX;
+ typedef union crypto_mutex_st {
+ double alignment;
+ uint8_t padding[3*sizeof(int) + 5*sizeof(unsigned) + 16 + 8];
++#if defined(__NetBSD__)
++ uint8_t nbpad[64 + 8];
++#endif
+ } CRYPTO_MUTEX;
+ #endif
+
diff -r a6397642f54c -r e54abe00b5de lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_UnixNetworkInterfaceFactory.cs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-mcs_class_System_System.Net.NetworkInformation_UnixNetworkInterfaceFactory.cs Tue Feb 08 13:39:17 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-mcs_class_System_System.Net.NetworkInformation_UnixNetworkInterfaceFactory.cs,v 1.1 2022/02/08 13:39:17 gavan Exp $
+
+--- mcs/class/System/System.Net.NetworkInformation/UnixNetworkInterfaceFactory.cs.orig 2021-02-22 15:50:13.000000000 +0000
++++ mcs/class/System/System.Net.NetworkInformation/UnixNetworkInterfaceFactory.cs
+@@ -43,7 +43,7 @@ namespace System.Net.NetworkInformation
+ if (runningOnUnix) {
+ // XXX: OpenBSD and NetBSD too? It seems other platforms map closer to the Mac OS version than Linux,
+ // even if not exactly; it seems Linux and/or glibc are the different ones.
+- if (Platform.IsMacOS || Platform.IsOpenBSD)
++ if (Platform.IsMacOS || Platform.IsOpenBSD || Platform.IsNetBSD)
+ return new MacOsNetworkInterfaceAPI ();
+ if (Platform.IsFreeBSD)
+ return new FreeBSDNetworkInterfaceAPI ();
diff -r a6397642f54c -r e54abe00b5de lang/mono/patches/patch-mcs_class_System_System_Platform.cs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-mcs_class_System_System_Platform.cs Tue Feb 08 13:39:17 2022 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-mcs_class_System_System_Platform.cs,v 1.1 2022/02/08 13:39:17 gavan Exp $
+
+--- mcs/class/System/System/Platform.cs.orig 2021-02-22 15:50:13.000000000 +0000
++++ mcs/class/System/System/Platform.cs
+@@ -53,6 +53,7 @@ namespace System {
+ #else
+ static bool isFreeBSD;
+ static bool isOpenBSD;
++ static bool isNetBSD;
+
+ [DllImport ("libc")]
+ static extern int uname (IntPtr buf);
+@@ -82,6 +83,9 @@ namespace System {
+ case "OpenBSD":
+ isOpenBSD = true;
+ break;
++ case "NetBSD":
++ isNetBSD = true;
++ break;
+ }
+ }
+ Marshal.FreeHGlobal (buf);
+@@ -113,6 +117,14 @@ namespace System {
+ }
+ }
+
++ public static bool IsNetBSD {
++ get {
++ if (!checkedOS)
++ CheckOS();
++ return isNetBSD;
++ }
++ }
++
+ public static bool IsIBMi {
+ get {
+ if (!checkedOS)
diff -r a6397642f54c -r e54abe00b5de lang/mono/patches/patch-msvc_mono.props
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/mono/patches/patch-msvc_mono.props Tue Feb 08 13:39:17 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-msvc_mono.props,v 1.1 2022/02/08 13:39:17 gavan Exp $
+
+--- msvc/mono.props.orig 2021-02-22 15:50:14.000000000 +0000
++++ msvc/mono.props
+@@ -26,7 +26,7 @@
+ <!-- When true, ported mono projects will build using C++ instead of C compiler. When false, all project will be build using the default compiler. -->
+ <MONO_COMPILE_AS_CPP>false</MONO_COMPILE_AS_CPP>
+ <!-- When true, mono binaries will link and include BTLS. When false, mono binaries will not link and include BTLS. -->
+- <MONO_ENABLE_BTLS>false</MONO_ENABLE_BTLS>
++ <MONO_ENABLE_BTLS>true</MONO_ENABLE_BTLS>
+ <!-- When true, mono binaries will be compiled for use as a .NET Core runtime. -->
+ <MONO_ENABLE_NETCORE>false</MONO_ENABLE_NETCORE>
+ </PropertyGroup>
Home |
Main Index |
Thread Index |
Old Index