amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mono: Change styling to suit guix coding guidelines (no functional change).

Browse source 
Follow-up to commits c9f1d2315f,
7314d9c184,
29182f4bab,
0f9ddc4c75,
f47993f0c7,
60d8e77f38.

* gnu/packages/dotnet.scm (mono-1.2.6): Change styling.
(mono-1.9.1): Change styling.
(mono-2.4.2): Change styling.
(mono-3.12.1): Change styling.
(mono-4.9.0): Change styling.  Add comments.

Change-Id: I1523159838b3726b3c86407558e2b89a58c2769b
This commit is contained in:
Danny Milosavljevic 2025-07-21 00:08:35 +02:00
parent 33fc08d5e2
commit d725d59c78
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 117 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/dotnet.scm
View file

@ -320,6 +320,11 @@ for use with .NET-capable runtime engines and applications.")
"#define MONO_TLS_FAST __attribute__((used)) "))))
(define-public mono-1.2.6
(let ((cflags (string-append "-O2 -g -DARG_MAX=500 "
"-Wno-error=implicit-function-declaration "
"-Wno-error=incompatible-pointer-types "
"-Wno-error=implicit-int "
"-Wno-error=return-mismatch")))
(package
(version "1.2.6")
(name "mono")
@ -366,7 +371,7 @@ for use with .NET-capable runtime engines and applications.")
(string-append "EXTERNAL_RUNTIME="
#+(this-package-native-input "pnet-git")
"/bin/ilrun")
"CFLAGS=-O2 -g -DARG_MAX=500 -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -Wno-error=implicit-int -Wno-error=return-mismatch"
(string-append "CFLAGS=" #$cflags)
#$(string-append "CC=" (cc-for-target))
"V=1")
;; build fails nondeterministically without this
@ -383,7 +388,7 @@ for use with .NET-capable runtime engines and applications.")
(add-after 'unpack 'set-env
(lambda _
;; Configure script for sock_un.sun_path uses exit() without importing it.
(setenv "CFLAGS" "-O2 -g -DARG_MAX=500 -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -Wno-error=implicit-int -Wno-error=return-mismatch")
(setenv "CFLAGS" #$cflags)
;; All tests under mcs/class fail trying to access $HOME
(setenv "HOME" "/tmp")
;; ZIP files have "DOS time" which starts in Jan 1980.
@ -410,7 +415,7 @@ a C-style programming language from Microsoft that is very similar to Java.")
;; mono/mono (the mono VM, I think they meant mono/mini)
license:lgpl2.0+ ;; note: ./mcs/LICENSE.LGPL specifies no version
;; mcs/jay
license:bsd-4))))
license:bsd-4)))))
(define-public mono-1.9.1
(package
@ -444,7 +449,11 @@ a C-style programming language from Microsoft that is very similar to Java.")
(arguments
(substitute-keyword-arguments (package-arguments mono-1.2.6)
((#:make-flags _ #f)
#~(list "CFLAGS=-O2 -g -DARG_MAX=500 -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -Wno-error=implicit-int -Wno-error=return-mismatch "
#~(list (string-append "CFLAGS=-O2 -g -DARG_MAX=500 "
"-Wno-error=implicit-function-declaration "
"-Wno-error=incompatible-pointer-types "
"-Wno-error=implicit-int "
"-Wno-error=return-mismatch")
#$(string-append "CC=" (cc-for-target))
"NO_SIGN_ASSEMBLY=yes" ; non-reproducible otherwise.
"V=1"))
@ -524,7 +533,12 @@ a C-style programming language from Microsoft that is very similar to Java.")
(arguments
(substitute-keyword-arguments (package-arguments mono-1.9.1)
((#:make-flags _ #f)
#~(list "CFLAGS=-O2 -g -DARG_MAX=500 -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -Wno-error=implicit-int -Wno-error=return-mismatch -Wno-error=int-conversion "
#~(list (string-append "CFLAGS=-O2 -g -DARG_MAX=500 "
"-Wno-error=implicit-function-declaration "
"-Wno-error=incompatible-pointer-types "
"-Wno-error=implicit-int "
"-Wno-error=return-mismatch "
"-Wno-error=int-conversion ")
#$(string-append "CC=" (cc-for-target))
"V=1"))
((#:tests? _ #f)
@ -794,8 +808,13 @@ a C-style programming language from Microsoft that is very similar to Java.")
#~(modify-phases #$phases
(replace 'set-cflags
(lambda _
(setenv "CFLAGS" "-O2 -g -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types -Wno-error=implicit-int -Wno-error=return-mismatch -Wno-error=int-conversion")
))
(setenv "CFLAGS"
(string-append "-O2 -g"
"-Wno-error=implicit-function-declaration"
"-Wno-error=incompatible-pointer-types"
"-Wno-error=implicit-int"
"-Wno-error=return-mismatch"
"-Wno-error=int-conversion"))))
(add-after 'unpack 'set-TZ
(lambda _
;; for some reason a default is only used if this is empty, not
@ -874,12 +893,16 @@ a C-style programming language from Microsoft that is very similar to Java.")
"--with-csc=mcs"))
((#:phases phases #~%standard-phases)
#~(modify-phases #$phases
;; The files moved and were fixed upstream anyway.
(delete 'fix-includes)
;; GCC static library linking dependency resolution got stricter--so
;; we have to add a dependency.
(add-after 'unpack 'patch-sgen-linking
(lambda _
(substitute* "tools/monograph/Makefile.am"
(("/mono/metadata/libmonoruntimesgen-static[.]la")
"/mono/metadata/libmonoruntimesgen-static.la $(top_builddir)/mono/sgen/libmonosgen-static.la"))))
(string-append "/mono/metadata/libmonoruntimesgen-static.la "
"$(top_builddir)/mono/sgen/libmonosgen-static.la")))))
(add-before 'configure 'set-TZDIR
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(search-input-directory (or native-inputs inputs)