starlightnet.work
.
+8
Diff
round #0
+8
.forgejo/build.fish
+8
.forgejo/build.fish
···
24
24
_upx zig-out/bin/makko -o build/makko-x86_64-linux
25
25
end
26
26
27
+
function build-x86_64-freebsd
28
+
echo "building x86_64 targeting athlon64, FreeBSD"
29
+
zig_build -Dtarget=x86_64-freebsd -Dcpu=athlon64
30
+
_upx zig-out/bin/makko -o build/makko-x86_64-freebsd
31
+
end
32
+
27
33
function build-aarch64-linux
28
34
echo "building aarch64, musl-linux-static"
29
35
zig_build -Dtarget=aarch64-linux-musl
···
49
55
end
50
56
51
57
switch $argv
58
+
case build-x86_64-freebsd
59
+
build-x86_64-linux
52
60
case build-x86_64-linux
53
61
build-x86_64-linux
54
62
case build-aarch64-linux
History
1 round
8 comments
lunyav.tngl.sh
submitted
#0
expand 8 comments
just gave this a go locally:
位 curl https://tangled.org/starlightnet.work/Makko/pulls/1/round/0.patch | git apply
% Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
100 758 100 758 0 0 913 0 --:--:-- --:--:-- --:--:-- 913
error: patch failed: .forgejo/build.fish:24
error: .forgejo/build.fish: patch does not apply
unfortunately it seems git is unhappy with the trailing spaces on L24 in the source (which are not present in the patch file), resulting in a context line mismatch.
oh that is evil
should be fine to just
diff --git a/.forgejo/build.fish b/.forgejo/build.fish
index 3c1f7f0..27848e8 100755
--- a/.forgejo/build.fish
+++ b/.forgejo/build.fish
@@ -24,6 +24,12 @@ function build-x86_64-linux
_upx zig-out/bin/makko -o build/makko-x86_64-linux
end
+function build-x86_64-freebsd
+ echo "building x86_64 targeting athlon64, FreeBSD"
+ zig_build -Dtarget=x86_64-freebsd -Dcpu=athlon64
+ _upx zig-out/bin/makko -o build/makko-x86_64-freebsd
+end
+
function build-aarch64-linux
echo "building aarch64, musl-linux-static"
zig_build -Dtarget=aarch64-linux-musl
@@ -49,6 +55,8 @@ function build-intel-macos
end
switch $argv
+ case build-x86_64-freebsd
+ build-x86_64-linux
case build-x86_64-linux
build-x86_64-linux
case build-aarch64-linux
yeah this actually applies
yep! removing the two trailing spaces in the main branch would also fix this! to avoid errors like this, i typically do git diff | xclip or git format-patch -1 --stdout | xclip, so that trailing spaces/newlines do not get swallowed up by manual copy/paste.
oh I also completely overlooked how line 59 references the linux build function, not the newly added freebsd one
I seem to always get an 502 Bad Gateway error in the console when I try to resubmit my patch.
closed without merging
this looks good to me! tangled says there is a merge conflict but I don't see where, so I'll try to merge it manually.