commit b53323a

hovercats  ·  2024-09-30 08:53:28 +0000 UTC
parent 510128a
muon: port to oasis. bump to 0.3.0
13 files changed,  +98, -27
+3, -0
1@@ -290,3 +290,6 @@
2 [submodule "pkg/scdoc/src"]
3 	path = pkg/scdoc/src
4 	url = https://git.sr.ht/~sircmpwn/scdoc
5+[submodule "pkg/muon/src"]
6+	path = pkg/muon/src
7+	url = https://sr.ht/~lattis/muon/
+1, -0
1@@ -55,6 +55,7 @@ subgen 'man-pages-posix'
2 subgen 'mandoc'
3 subgen 'mpv'
4 subgen 'mtdev'
5+subgen 'muon'
6 subgen 'mupdf'
7 subgen 'musl'
8 subgen 'nasm'
+1, -0
1@@ -0,0 +1 @@
2+/local.ninja
+81, -0
 1@@ -0,0 +1,81 @@
 2+cflags{
 3+	'-D MUON_PLATFORM_posix',
 4+	'-D MUON_ENDIAN=0',
 5+	'-D MUON_STATIC',
 6+	'-std=c99',
 7+	'-I $srcdir/include',
 8+}
 9+
10+build('copy', '$outdir/version.c', '$dir/version.c')
11+
12+exe('muon', [[
13+$outdir/version.c
14+src/(
15+    args.c cmd_install.c cmd_test.c
16+    coerce.c compilers.c embedded.c
17+    error.c guess.c install.c log.c
18+    machine_file.c machines.c main.c
19+    memmem.c meson_opts.c options.c
20+    opts.c rpmvercmp.c sha_256.c wrap.c
21+    backend/(
22+    	backend.c common_args.c ninja.c output.c
23+    	ninja/(
24+    		alias_target.c build_target.c
25+    		custom_target.c rules.c
26+    	)
27+    )
28+    datastructures/(
29+    	arr.c bucket_arr.c hash.c stack.c
30+    )
31+    formats/(
32+    	editorconfig.c ini.c
33+    	lines.c tap.c
34+    )
35+    functions/(
36+    	array.c boolean.c both_libs.c
37+    	build_target.c compiler.c
38+    	configuration_data.c custom_target.c
39+    	dependency.c dict.c disabler.c
40+    	environment.c external_program.c
41+    	feature_opt.c file.c generator.c
42+	    kernel.c modules.c machine.c meson.c
43+    	number.c run_result.c
44+    	source_configuration.c source_set.c
45+    	string.c subproject.c
46+	    kernel/(
47+    		build_target.c configure_file.c
48+    		custom_target.c dependency.c
49+    		install.c options.c subproject.c
50+    	)
51+    	modules/(
52+    		fs.c keyval.c pkgconfig.c
53+    		python.c sourceset.c toolchain.c
54+    	)
55+    )
56+    lang/(
57+    	analyze.c compiler.c eval.c
58+    	fmt.c func_lookup.c lexer.c
59+    	object.c object_iterators.c parser.c
60+    	serial.c string.c typecheck.c
61+    	vm.c workspace.c
62+    )
63+    platform/(
64+    	assert.c filesystem.c os.c mem.c 
65+    	path.c run_cmd.c uname.c
66+    	posix/(
67+    		filesystem.c init.c log.c
68+    		os.c path.c rpath_fixer.c
69+    		run_cmd.c term.c timer.c
70+    		uname.c
71+    	)
72+    )
73+    external/(
74+    	libarchive_null.c libcurl_null.c 
75+    	libpkgconf_null.c samurai_null.c 
76+    	tinyjson_null.c readline_builtin.c
77+    )
78+)]])
79+
80+file('bin/muon', '755', '$outdir/muon')
81+
82+fetch 'git'
+1, -0
1@@ -0,0 +1 @@
2+Subproject commit 3e8725c02503d26284dfcaa3454a9bbb03e684f3
+1, -0
1@@ -0,0 +1 @@
2+0.3.0 r0
+9, -0
 1@@ -0,0 +1,9 @@
 2+#include "compat.h"
 3+
 4+#include "version.h"
 5+
 6+const struct muon_version muon_version = {
 7+	.version = "0.3.0",
 8+	.vcs_tag = "3e8725c0",
 9+	.meson_compat = "1.5.99",
10+};
+0, -24
 1@@ -1,24 +0,0 @@
 2-#!/bin/sh -e
 3-
 4-export DESTDIR="$1"
 5-
 6-# Set -Ddefault_library=both by default.
 7-sed "s/\(value: \)'static'/\1'both'/" src/script/per_project_options.meson > _
 8-mv -f _ src/script/per_project_options.meson
 9-
10-command -v muon > /dev/null || {
11-      ./bootstrap.sh build
12-    export PATH="$PWD/build:$PATH"
13-    
14-}
15-
16-muon setup \
17-      -Dprefix=/usr \
18-      -Ddocs=disabled \
19-      -Dlibcurl=disabled \
20-      -Dlibpkgconf=disabled \
21-      -Dstatic=true \
22-      build
23-
24-samu -C build
25-muon -C build install
+0, -1
1@@ -1 +0,0 @@
2-c6245db8a05522a2b62c53da759db3575a0f8b275f200de15385a661020c7bb15f
+0, -0
+0, -1
1@@ -1 +0,0 @@
2-https://git.sr.ht/~lattis/muon/archive/1aeda599b10ac911f66f41e15076e90465767f60.tar.gz
+0, -1
1@@ -1 +0,0 @@
2-0.2.0 1
+1, -0
1@@ -41,6 +41,7 @@ return {
2 		'linux-headers',
3 		'make',
4 		'man-pages-posix',
5+		'muon',
6 		'musl',
7 		'nasm', 
8 		'qbe',