From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id AI7iB/BjYGdQgAEAe85BDQ:P1 (envelope-from ) for ; Mon, 16 Dec 2024 17:31:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id AI7iB/BjYGdQgAEAe85BDQ (envelope-from ) for ; Mon, 16 Dec 2024 18:31:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ixN66V8T; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=U0mRZQ91; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734370269; a=rsa-sha256; cv=none; b=NvkHiL7tS0NMiO6zekqyBNAPqQGnsN9nEKF2ltTifiIXaeJNGkEdesy2UA/UqYy0W9hQC6 EDT8IU3jU8LSWodF/1jb25FPb62apGSzwJHIx99uSq4V2CpP65MqXGGPRoccT09QLYTBz9 OjPfms7KqTxpXuXiem7mRyGVdVrvyEQTBCG/XN1XbWXITOFbjQb6rx3YKPMrth8hJgKXLc PfdGk8LEOZB7HCrTESpZFpYcVLe9TxKr1JbYZmbjREyex5W5p4mHHpfgmycqgfUj5vEES8 UYro+eWFhHWfHe1gKPIqCH5Hxiy8+nS5gsLpuoiwmZEqpI/napGpmrNi8xQu1Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=ixN66V8T; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=U0mRZQ91; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734370269; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=xzD+IGCEA04X9RKqAXpz/JIXIML6PGBckSTMc+6eg08=; b=LBRjiAbcTITyddcWf+205nS4sVOOOdN6U9nzccqs5Eh+7Mrzh81uieG4KLc3ydSHV/PaiR xBer+2YVX5Fw90mHPxOD/98d9/rsloDKabzdomTIlq24ZXfm+xwtLh0uvQvfT4L0+qy/2g DCYK7rd1mbyEP5Z7EyKBR1bXICP7MIrMb6tWqab9ubffcsSfkM8xvYz8iJVFRTRTNGDcuM WIpBAvPQZMItG+VxgYt2B6BXB+NZU3RhMX/EcP8QVLhk7FceonZpeULnuhBt3p3k6m/OIR kEyowb7sQUrbWSDekgbVTMrKMAI/OToseZvo9D+GWIKBVKwknnjuBNtZx2p1yQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B364ABC3 for ; Mon, 16 Dec 2024 18:31:07 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNEvp-0001dK-0p; Mon, 16 Dec 2024 12:30:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tNEu0-0000FQ-Pa for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tNEu0-0001vM-EP for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xzD+IGCEA04X9RKqAXpz/JIXIML6PGBckSTMc+6eg08=; b=ixN66V8TOF11jP86djG1D/liiMuZ9OzKnp1RvQ4n2Vd2N/5+KT9HmgMTg52FVzm/Ijvwfnhnch7fjP/X5nUIk7XFmv0gLg+n16e1Q96AuzG3iCUshPyQS+lcLymkL/jnjew4bHGiyzeGUK5/bLC2MIye18Y8qYRCkxonIpqahULu3UjmZC6FSNClvq2vqvSkkhPbIGmTkxYPnPF53NDHiT4asGbnF69CJNRjSC+4ZzJa0Fr/lqSVrl9RbB66xxxNQatWxDtNY2KrLMdKPArSLzzT/p1r3wq5jY1MhFj7TuXOQD5vFt1sfJymwtW8zghsqueSz5lwcYSOzvDHXC5x1g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tNEu0-0006Jn-7j for guix-patches@gnu.org; Mon, 16 Dec 2024 12:29:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74609] [PATCH 05/21] gnu: Add mono-1.9.1. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Dec 2024 17:29:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74609 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74609@debbugs.gnu.org Cc: aaron.covrig.us@ieee.org, ludo@gnu.org, unmush , richard@freakingpenguin.com, unmush@proton.me, janneke@gnu.org Received: via spool by 74609-submit@debbugs.gnu.org id=B74609.173437010223999 (code B ref 74609); Mon, 16 Dec 2024 17:29:04 +0000 Received: (at 74609) by debbugs.gnu.org; 16 Dec 2024 17:28:22 +0000 Received: from localhost ([127.0.0.1]:55834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtK-0006F0-06 for submit@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:22 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:57823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tNEtH-0006Ee-Eb for 74609@debbugs.gnu.org; Mon, 16 Dec 2024 12:28:20 -0500 Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-385df53e559so3655484f8f.3 for <74609@debbugs.gnu.org>; Mon, 16 Dec 2024 09:28:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734370039; x=1734974839; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=xzD+IGCEA04X9RKqAXpz/JIXIML6PGBckSTMc+6eg08=; b=U0mRZQ912FMhEyH4Oh3WzOrq/y7rwFTZONBVZBT8kn4nF57W/MRZSxGZJb+x6Fbae7 SDIYYYujHLbGBOJ2Jd1dUAWgV+gGzSskUSiRaPM+lJXFgYdrlR7i7/agxVEhIEDxmW3v 5vcaDfNjavE9cPtZgiPgF9Nh11FNBuP6iA/msHqTB+rfLCWpMgon4hs5UXmvWFi7cNJF ZiMb04WJFQHRXyzZ6qubXmGie/y3wiPYSRf7fhC6XHHeAXO44R89toecB5CtiEyLndTW kkxC3auUlycKTqyzFLsdcm3geq4yJlh+0+4SNstrhUHNQoqTw2RVqCdw0EDzXG83hJ1C 1vgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734370039; x=1734974839; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xzD+IGCEA04X9RKqAXpz/JIXIML6PGBckSTMc+6eg08=; b=LT/ckD8NGIaYubHMXzz4SxqO3Ky4cTmXD4Z8wBXODuGSciWwp7A5T658Ao500nVnjM z31i2fZIOPHBPntERAdO7ILn4OYFLGi8rY+7hUC+PFyY2YCTCVVHxzqXuyi1SOuWyFuK ozoa1sleh41ZwoHyKtN2tB6rcXpmnP2bKB7vpIBX08UfWRcu4zfgNBH9WviT6LvvUrR2 FmdWvXD60esm8eK9XZYqJAvHj0vSDqBh7wQRClxBSVa7vo+GlaZ+O4mBnJn3zpryi0Ci aMTn8M9lUQUemMIMnJ7oSWLuAFiiAY15hkNDCV7AeqtlxN1sWeqQ8g2n92mCGoP5OMKg 77fA== X-Gm-Message-State: AOJu0YxsC9af9/9AuXYU+16u8/Vt0HdP1e2JhqlKVqC5hf+clgDg8d4+ TEaZnpiQW0+Rov13RoF9VinLXM7GjcSnJ1JL+du8Rd9i3ODrNjdn8xAnVFI6 X-Gm-Gg: ASbGncvEww1nd6iAa3Q/f00kcxGX4/Jhhz3YiKJURO8mLhKxkbpVUdJvMjreMcm5lMW cfRfdMI9IwUUAxD670XZAGhYpwVTOokmWsRxCuELvgdhMqJdX7Usu+HWRYgI0TNo4qaMML4dDhe mLzj+ZwevOWiDPAvwqCWOTnsFlmHfC/EJQqnt43XJObK8WfMxRbKs13MREVWu2w1eRJ58B7KggR oQTGWj9VwqRxwdh8XDtO5ScA/ZUxCcowWJWP6sIc3cN7gYsDxwJ+Y+9DUo7tQ== X-Google-Smtp-Source: AGHT+IH0GUWfkOpv774hkZ1HqL5ebiSNH9p89TVWi8FmPjcsAdHdctAkmnj8zP+ooF66y3y/03Umaw== X-Received: by 2002:a05:6000:1f85:b0:385:f7d9:99f5 with SMTP id ffacd0b85a97d-3889ad354a0mr9687246f8f.51.1734370038724; Mon, 16 Dec 2024 09:27:18 -0800 (PST) Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c801acaesm8687386f8f.54.2024.12.16.09.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 09:27:18 -0800 (PST) From: Efraim Flashner Date: Mon, 16 Dec 2024 19:26:28 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.91 X-Spam-Score: -4.91 X-Migadu-Queue-Id: B364ABC3 X-Migadu-Scanner: mx12.migadu.com X-TUID: TE3cilGrZy+A From: unmush * gnu/packages/dotnet.scm (mono-1.9.1): New variable. * gnu/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch: New patch. * gnu/packages/patches/mono-1.9.1-fixes.patch: New patch. * gnu/local.mk (dist_patch_DATA): register new patches. Change-Id: I19c16041fa4419a7c31ca510da6f33a03785f584 --- gnu/local.mk | 2 + gnu/packages/dotnet.scm | 60 +++++++++++++++++++ ...-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch | 14 +++++ gnu/packages/patches/mono-1.9.1-fixes.patch | 59 ++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 gnu/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch create mode 100644 gnu/packages/patches/mono-1.9.1-fixes.patch diff --git a/gnu/local.mk b/gnu/local.mk index bd2d3e61df4..38e98386d20 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1819,6 +1819,8 @@ dist_patch_DATA = \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/mono-1.2.6-bootstrap.patch \ + %D%/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch \ + %D%/packages/patches/mono-1.9.1-fixes.patch \ %D%/packages/patches/mosaicatcher-unbundle-htslib.patch \ %D%/packages/patches/mrrescue-support-love-11.patch \ %D%/packages/patches/mtools-mformat-uninitialized.patch \ diff --git a/gnu/packages/dotnet.scm b/gnu/packages/dotnet.scm index 2f93d4bbd00..3a3bcb3c940 100644 --- a/gnu/packages/dotnet.scm +++ b/gnu/packages/dotnet.scm @@ -361,3 +361,63 @@ (define-public mono-1.2.6 license:lgpl2.0+ ;; note: ./mcs/LICENSE.LGPL specifies no version ;; mcs/jay license:bsd-4)))) + +(define-public mono-1.9.1 + (package + (inherit mono-1.2.6) + (version "1.9.1") + (name "mono") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.winehq.org/mono/mono.git") + (commit (string-append "mono-" "1.9.1.1")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0s1n3zdhc2alk9smxfdl1kjz7lz2p19gs0ks4hgr864jlmf13bws")) + (modules '((guix build utils) + (ice-9 string-fun))) + (snippet prepare-mono-source) + (patches + (search-patches + "mono-1.9.1-fixes.patch" + "mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch")))) + (native-inputs + (modify-inputs (package-native-inputs mono-1.2.6) + (delete "pnet-git") + (delete "pnetlib-git") + (prepend mono-1.2.6) + (append which) + ;; needed for tests + (append perl))) + (arguments + (substitute-keyword-arguments (package-arguments mono-1.2.6) + ((#:make-flags _ #f) + #~(list "CC=gcc" "V=1")) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'configure 'set-cflags + (lambda _ + ;; apparently can't be set via make flags in this version + (let ((original (getenv "CFLAGS"))) + (setenv "CFLAGS" (string-append (or original "") + (if original " " "") + "-DARG_MAX=500"))))) + (add-before 'configure 'set-create-image-version + (lambda _ + ;; pnet produces v2.x assemblies. Mono does this weird thing + ;; where it always produces assemblies of the same version as + ;; the runtime that is running it, which is based on the + ;; version of the assembly that it loaded, which is based on + ;; what it decided for the previous compiler... on and on all + ;; the way back to pnet. This breaks that chain, because + ;; otherwise it ends up compiling the initial mcs against .NET + ;; 2.0 libraries and then running with .NET 1.0 libraries. + (setenv "MONO_CREATE_IMAGE_VERSION" "v1.1.4322"))) + (add-after 'unpack 'patch-test-driver-shebang + (lambda _ + (patch-shebang "mono/tests/test-driver"))))) + ((#:tests? _ #f) #f) + ((#:parallel-tests? _ #f) #f))))) diff --git a/gnu/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch b/gnu/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch new file mode 100644 index 00000000000..1eef0548ca1 --- /dev/null +++ b/gnu/packages/patches/mono-1.9.1-add-MONO_CREATE_IMAGE_VERSION.patch @@ -0,0 +1,14 @@ +diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c +index ce053b0ef49..7c51f20c4cf 100644 +--- a/mono/metadata/reflection.c ++++ b/mono/metadata/reflection.c +@@ -4336,6 +4336,9 @@ create_dynamic_mono_image (MonoDynamicAssembly *assembly, char *assembly_name, c + + const char *version = mono_get_runtime_info ()->runtime_version; + ++ char *env_ver = getenv("MONO_CREATE_IMAGE_VERSION"); ++ if (env_ver) version = env_ver; ++ + #if HAVE_BOEHM_GC + image = GC_MALLOC (sizeof (MonoDynamicImage)); + #else diff --git a/gnu/packages/patches/mono-1.9.1-fixes.patch b/gnu/packages/patches/mono-1.9.1-fixes.patch new file mode 100644 index 00000000000..16353ea741e --- /dev/null +++ b/gnu/packages/patches/mono-1.9.1-fixes.patch @@ -0,0 +1,59 @@ +diff --git a/data/mono.pc.in b/data/mono.pc.in +index 6da0960db2d..d43bb187218 100644 +--- a/data/mono.pc.in ++++ b/data/mono.pc.in +@@ -7,6 +7,6 @@ sysconfdir=@sysconfdir@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-Requires: glib-2.0 gthread-2.0 ++Requires: glib-2.0 gthread-2.0 bdw-gc + Libs: -L${libdir} @export_ldflags@ -lmono @libmono_ldflags@ + Cflags: -I${includedir} @libmono_cflags@ +diff --git a/mono-uninstalled.pc.in b/mono-uninstalled.pc.in +index 7fa3f12dc91..2a0734362fd 100644 +--- a/mono-uninstalled.pc.in ++++ b/mono-uninstalled.pc.in +@@ -1,6 +1,6 @@ + Name: Mono + Description: Mono Runtime + Version: @VERSION@ +-Requires: glib-2.0 gthread-2.0 ++Requires: glib-2.0 gthread-2.0 bdw-gc + Libs: -L@mono_build_root@/mono/mini/.libs @export_ldflags@ -lmono @libmono_ldflags@ + Cflags: -I@abs_top_srcdir@ -I@abs_top_srcdir@/mono @libmono_cflags@ +diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am +index 2e480190c8c..90d0f619959 100644 +--- a/mono/metadata/Makefile.am ++++ b/mono/metadata/Makefile.am +@@ -157,7 +157,6 @@ libmonoruntimeinclude_HEADERS = \ + object.h \ + exception.h \ + profiler.h \ +- appdomain.h \ + mono-config.h \ + debug-helpers.h \ + mempool.h +diff --git a/mono/mini/driver.c b/mono/mini/driver.c +index ffa4b5e5e69..85a954960eb 100644 +--- a/mono/mini/driver.c ++++ b/mono/mini/driver.c +@@ -1033,6 +1033,7 @@ mono_main (int argc, char* argv[]) + #endif + if (!g_thread_supported ()) + g_thread_init (NULL); ++ GC_allow_register_threads(); + + if (mono_running_on_valgrind () && getenv ("MONO_VALGRIND_LEAK_CHECK")) { + GMemVTable mem_vtable; +diff --git a/runtime/Makefile.am b/runtime/Makefile.am +index e3a8a21e9e2..587b9f4aa79 100644 +--- a/runtime/Makefile.am ++++ b/runtime/Makefile.am +@@ -1,6 +1,3 @@ +-# hack to prevent 'check' from depending on 'all' +-AUTOMAKE_OPTIONS = cygnus +- + tmpinst = _tmpinst + + noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper -- Efraim Flashner אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted