commit aa48c2e
hovercats
·
2025-02-14 11:31:13 +0000 UTC
parent b30689d
muon: 0.4.0
5 files changed,
+93,
-105
+0,
-1
1@@ -294,7 +294,6 @@
2 [submodule "pkg/muon/src"]
3 path = pkg/muon/src
4 url = https://git.sr.ht/~lattis/muon/
5- ignore = all
6 [submodule "pkg/libpkgconf/src"]
7 path = pkg/libpkgconf/src
8 url = https://github.com/pkgconf/pkgconf
+91,
-2
1@@ -6812,6 +6812,95 @@ static struct embedded_file embedded[] = {
2 122, 108, 105, 98, 46, 104, 62, 39, 41, 46, 115, 116, 114, 105,
3 112, 40, 39, 34, 39, 41, 44, 10, 32, 32, 32, 32, 32, 32,
4 32, 32, 41, 10, 32, 32, 32, 32, 101, 110, 100, 102, 117, 110,
5-99, 44, 10, 41, 10, 0x0
6-}, .len = 2344 } },
7+99, 44, 10, 41, 10, 10, 109, 101, 115, 111, 110, 46, 114, 101,
8+103, 105, 115, 116, 101, 114, 95, 100, 101, 112, 101, 110, 100, 101,
9+110, 99, 121, 95, 104, 97, 110, 100, 108, 101, 114, 40, 10, 32,
10+32, 32, 32, 39, 111, 98, 106, 102, 119, 39, 44, 10, 32, 32,
11+32, 32, 99, 111, 110, 102, 105, 103, 95, 116, 111, 111, 108, 58,
12+32, 102, 117, 110, 99, 40, 115, 116, 97, 116, 105, 99, 32, 98,
13+111, 111, 108, 58, 44, 32, 110, 97, 116, 105, 118, 101, 32, 98,
14+111, 111, 108, 58, 44, 32, 109, 111, 100, 117, 108, 101, 115, 32,
15+108, 105, 115, 116, 91, 115, 116, 114, 93, 58, 44, 32, 95, 32,
16+103, 108, 111, 98, 91, 97, 110, 121, 93, 58, 41, 32, 45, 62,
17+32, 100, 101, 112, 10, 32, 32, 32, 32, 32, 32, 32, 32, 111,
18+98, 106, 102, 119, 99, 111, 110, 102, 105, 103, 32, 61, 32, 102,
19+105, 110, 100, 95, 112, 114, 111, 103, 114, 97, 109, 40, 39, 111,
20+98, 106, 102, 119, 45, 99, 111, 110, 102, 105, 103, 39, 44, 32,
21+114, 101, 113, 117, 105, 114, 101, 100, 58, 32, 102, 97, 108, 115,
22+101, 41, 10, 10, 32, 32, 32, 32, 32, 32, 32, 32, 105, 102,
23+32, 110, 111, 116, 32, 111, 98, 106, 102, 119, 99, 111, 110, 102,
24+105, 103, 46, 102, 111, 117, 110, 100, 40, 41, 10, 32, 32, 32,
25+32, 32, 32, 32, 32, 32, 32, 32, 32, 114, 101, 116, 117, 114,
26+110, 32, 110, 111, 116, 95, 102, 111, 117, 110, 100, 40, 41, 10,
27+32, 32, 32, 32, 32, 32, 32, 32, 101, 110, 100, 105, 102, 10,
28+10, 32, 32, 32, 32, 32, 32, 32, 32, 99, 111, 110, 102, 105,
29+103, 32, 61, 32, 102, 117, 110, 99, 40, 97, 114, 103, 115, 32,
30+108, 105, 115, 116, 91, 115, 116, 114, 93, 41, 32, 45, 62, 32,
31+108, 105, 115, 116, 91, 115, 116, 114, 93, 10, 32, 32, 32, 32,
32+32, 32, 32, 32, 32, 32, 32, 32, 111, 117, 116, 112, 117, 116,
33+32, 61, 32, 114, 117, 110, 95, 99, 111, 109, 109, 97, 110, 100,
34+40, 91, 111, 98, 106, 102, 119, 99, 111, 110, 102, 105, 103, 93,
35+32, 43, 32, 97, 114, 103, 115, 44, 32, 99, 104, 101, 99, 107,
36+58, 32, 116, 114, 117, 101, 41, 46, 115, 116, 100, 111, 117, 116,
37+40, 41, 10, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
38+32, 32, 118, 97, 108, 117, 101, 32, 61, 32, 91, 93, 10, 32,
39+32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114,
40+101, 97, 99, 104, 32, 97, 114, 103, 32, 58, 32, 111, 117, 116,
41+112, 117, 116, 46, 115, 112, 108, 105, 116, 40, 39, 32, 39, 41,
42+10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
43+32, 32, 32, 105, 102, 32, 97, 114, 103, 32, 33, 61, 32, 39,
44+39, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
45+32, 32, 32, 32, 32, 32, 32, 32, 118, 97, 108, 117, 101, 32,
46+43, 61, 32, 97, 114, 103, 10, 32, 32, 32, 32, 32, 32, 32,
47+32, 32, 32, 32, 32, 32, 32, 32, 32, 101, 110, 100, 105, 102,
48+10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 101,
49+110, 100, 102, 111, 114, 101, 97, 99, 104, 10, 10, 32, 32, 32,
50+32, 32, 32, 32, 32, 32, 32, 32, 32, 114, 101, 116, 117, 114,
51+110, 32, 118, 97, 108, 117, 101, 10, 32, 32, 32, 32, 32, 32,
52+32, 32, 101, 110, 100, 102, 117, 110, 99, 10, 10, 32, 32, 32,
53+32, 32, 32, 32, 32, 109, 111, 100, 117, 108, 101, 115, 95, 97,
54+114, 103, 115, 32, 61, 32, 91, 93, 10, 32, 32, 32, 32, 32,
55+32, 32, 32, 105, 102, 32, 110, 111, 116, 32, 105, 115, 95, 110,
56+117, 108, 108, 40, 109, 111, 100, 117, 108, 101, 115, 41, 10, 32,
57+32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 102, 111, 114,
58+101, 97, 99, 104, 32, 109, 111, 100, 117, 108, 101, 32, 58, 32,
59+109, 111, 100, 117, 108, 101, 115, 10, 32, 32, 32, 32, 32, 32,
60+32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 109, 111, 100, 117,
61+108, 101, 115, 95, 97, 114, 103, 115, 32, 43, 61, 32, 39, 45,
62+45, 112, 97, 99, 107, 97, 103, 101, 39, 10, 32, 32, 32, 32,
63+32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 109, 111,
64+100, 117, 108, 101, 115, 95, 97, 114, 103, 115, 32, 43, 61, 32,
65+109, 111, 100, 117, 108, 101, 10, 32, 32, 32, 32, 32, 32, 32,
66+32, 32, 32, 32, 32, 101, 110, 100, 102, 111, 114, 101, 97, 99,
67+104, 10, 32, 32, 32, 32, 32, 32, 32, 32, 101, 110, 100, 105,
68+102, 10, 10, 32, 32, 32, 32, 32, 32, 32, 32, 99, 111, 109,
69+112, 105, 108, 101, 95, 97, 114, 103, 115, 32, 61, 32, 99, 111,
70+110, 102, 105, 103, 40, 91, 39, 45, 45, 99, 112, 112, 102, 108,
71+97, 103, 115, 39, 44, 32, 39, 45, 45, 111, 98, 106, 99, 102,
72+108, 97, 103, 115, 39, 93, 32, 43, 32, 109, 111, 100, 117, 108,
73+101, 115, 95, 97, 114, 103, 115, 41, 10, 32, 32, 32, 32, 32,
74+32, 32, 32, 108, 105, 110, 107, 95, 97, 114, 103, 115, 32, 61,
75+32, 99, 111, 110, 102, 105, 103, 40, 91, 39, 45, 45, 108, 100,
76+102, 108, 97, 103, 115, 39, 44, 32, 39, 45, 45, 108, 105, 98,
77+115, 39, 93, 32, 43, 32, 109, 111, 100, 117, 108, 101, 115, 95,
78+97, 114, 103, 115, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32,
79+118, 101, 114, 115, 105, 111, 110, 32, 61, 32, 114, 117, 110, 95,
80+99, 111, 109, 109, 97, 110, 100, 40, 91, 111, 98, 106, 102, 119,
81+99, 111, 110, 102, 105, 103, 44, 32, 39, 45, 45, 118, 101, 114,
82+115, 105, 111, 110, 39, 93, 44, 32, 99, 104, 101, 99, 107, 58,
83+32, 116, 114, 117, 101, 41, 46, 115, 116, 100, 111, 117, 116, 40,
84+41, 46, 115, 116, 114, 105, 112, 40, 41, 10, 10, 32, 32, 32,
85+32, 32, 32, 32, 32, 114, 101, 116, 117, 114, 110, 32, 100, 101,
86+99, 108, 97, 114, 101, 95, 100, 101, 112, 101, 110, 100, 101, 110,
87+99, 121, 40, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
88+32, 32, 99, 111, 109, 112, 105, 108, 101, 95, 97, 114, 103, 115,
89+58, 32, 99, 111, 109, 112, 105, 108, 101, 95, 97, 114, 103, 115,
90+44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
91+108, 105, 110, 107, 95, 97, 114, 103, 115, 58, 32, 108, 105, 110,
92+107, 95, 97, 114, 103, 115, 44, 10, 32, 32, 32, 32, 32, 32,
93+32, 32, 32, 32, 32, 32, 118, 101, 114, 115, 105, 111, 110, 58,
94+32, 118, 101, 114, 115, 105, 111, 110, 44, 10, 32, 32, 32, 32,
95+32, 32, 32, 32, 41, 10, 32, 32, 32, 32, 101, 110, 100, 102,
96+117, 110, 99, 44, 10, 41, 10, 0x0
97+}, .len = 3592 } },
98 };
1@@ -1,100 +0,0 @@
2-From ad624c180bb847337453d4e857812c15253eebaf Mon Sep 17 00:00:00 2001
3-From: hovercats <hovercatswithlasereyes@protonmail.com>
4-Date: Sun, 9 Feb 2025 09:10:06 +0100
5-Subject: [PATCH] fix build with cproc
6-
7-Author: Micheal Forney
8-
9----
10- src/backend/common_args.c | 2 --
11- src/backend/introspect.c | 1 -
12- src/backend/xcode.c | 1 -
13- src/lang/analyze.c | 1 -
14- src/lang/object.c | 1 -
15- src/main.c | 2 +-
16- 6 files changed, 1 insertion(+), 7 deletions(-)
17-
18-diff --git a/src/backend/common_args.c b/src/backend/common_args.c
19-index d840bcf0..54b3acea 100644
20---- a/src/backend/common_args.c
21-+++ b/src/backend/common_args.c
22-@@ -404,7 +404,6 @@ ca_prepare_target_args(struct workspace *wk, const struct project *proj, struct
23- }
24-
25- obj _lang, _n;
26-- (void)_n;
27- obj_dict_for(wk, tgt->required_compilers, _lang, _n) {
28- enum compiler_language lang = _lang;
29- obj comp_id;
30-@@ -856,7 +855,6 @@ ca_regenerate_build_command(struct workspace *wk, bool opts_only)
31- }
32-
33- obj key, val;
34-- (void)key;
35- obj_dict_for(wk, wk->global_opts, key, val) {
36- struct obj_option *o = get_obj_option(wk, val);
37- if (o->source != option_value_source_environment) {
38-diff --git a/src/backend/introspect.c b/src/backend/introspect.c
39-index 96cf9217..cc45691f 100644
40---- a/src/backend/introspect.c
41-+++ b/src/backend/introspect.c
42-@@ -275,7 +275,6 @@ introspect_options(struct workspace *wk)
43- make_obj(wk, &doc, obj_array);
44-
45- obj key, opt;
46-- (void)key;
47- obj_dict_for(wk, wk->global_opts, key, opt) {
48- obj_array_push(wk, doc, introspect_option(wk, opt));
49- }
50-diff --git a/src/backend/xcode.c b/src/backend/xcode.c
51-index 7db1e1c6..d1f178f9 100644
52---- a/src/backend/xcode.c
53-+++ b/src/backend/xcode.c
54-@@ -525,7 +525,6 @@ xc_build_configuration_list(struct xc_ctx *ctx, struct project *proj, struct obj
55- obj pbx_gcc_preprocessor_definitions = xc_pbx_new(ctx, obj_array);
56-
57- obj _lang, args;
58-- (void)_lang;
59- // TODO: This adds duplicates
60- obj_dict_for(ctx->wk, tgt->args, _lang, args) {
61- obj_array_for(ctx->wk, args, v) {
62-diff --git a/src/lang/analyze.c b/src/lang/analyze.c
63-index 4d08c390..5d1ab720 100644
64---- a/src/lang/analyze.c
65-+++ b/src/lang/analyze.c
66-@@ -540,7 +540,6 @@ pop_scope_group(struct workspace *wk)
67-
68- { // Now, merge `merged` into base
69- obj k, aid;
70-- (void)k;
71- obj_dict_for(wk, merged, k, aid) {
72- struct assignment *a = bucket_arr_get(&assignments, aid), *b;
73- if ((b = assign_lookup(wk, a->name))) {
74-diff --git a/src/lang/object.c b/src/lang/object.c
75-index 3a66d0fe..b759a386 100644
76---- a/src/lang/object.c
77-+++ b/src/lang/object.c
78-@@ -720,7 +720,6 @@ static obj *
79- obj_array_index_pointer_raw(struct workspace *wk, obj arr, int64_t i)
80- {
81- obj v;
82-- (void)v;
83- int64_t j = 0;
84- obj_array_for_(wk, arr, v, iter)
85- {
86-diff --git a/src/main.c b/src/main.c
87-index 47e047ca..ec47960a 100644
88---- a/src/main.c
89-+++ b/src/main.c
90-@@ -622,7 +622,7 @@ static bool
91- cmd_dump_toolchains(void *_ctx, uint32_t argc, uint32_t argi, char *const argv[])
92- {
93- struct obj_compiler comp = { 0 };
94-- bool set_linker, set_static_linker;
95-+ bool set_linker = false, set_static_linker = false;
96-
97- const char *n1_args[32] = { "<value1>", "<value2>" };
98- struct args n1 = { n1_args, 2 };
99---
100-2.45.2
101-
+1,
-1
1@@ -1 +1 @@
2-Subproject commit 1016db602ff0315f0e819a41921a522991935040
3+Subproject commit 4344eb5d0bce5adca6921dfa1feef0f20bb015c7
+1,
-1
1@@ -1 +1 @@
2-0.3.0-315-g1016db60 r1
3+0.4.0 r0