diff --git a/build-support/v/v.c.patch b/build-support/v/v.c.patch new file mode 100644 index 000000000..2e25ab6f2 --- /dev/null +++ b/build-support/v/v.c.patch @@ -0,0 +1,19 @@ +--- v.c 2025-02-20 03:51:33.241023614 +0100 ++++ v.c-patched 2025-02-20 06:13:44.421172638 +0100 +@@ -2052,6 +2052,8 @@ + + // added by module `os`, file: debugger_linux.c.v:3: + ++/* ++ + #if defined(__has_include) + + #if __has_include() +@@ -2064,6 +2066,7 @@ + #include + #endif + ++*/ + + #if !defined(_WIN32) + // added by module `os`, file: fd.c.v:6: diff --git a/recipes/mlibc b/recipes/mlibc index 7ecf9899c..bc1afb00c 100644 --- a/recipes/mlibc +++ b/recipes/mlibc @@ -1,7 +1,7 @@ #! /bin/sh name=mlibc -version=b4752328c6a2b5341dc95d8e3b5a890589cdb43a +version=50ed5f5bdf667de876001427bbf93db3a2755968 revision=1 git_url="https://github.com/managarm/mlibc.git" commit=${version} @@ -15,7 +15,7 @@ configure() { CXXFLAGS="$TARGET_CXXFLAGS" \ LDFLAGS="$TARGET_LDFLAGS -Wl,/usr/local/libgcc-binaries/libgcc-$ARCHITECTURE.a" \ meson_configure_noflags \ - --buildtype=debugoptimized \ + --buildtype=release \ -Dno_headers=true \ -Ddefault_library=both \ -Dlibgcc_dependency=false \ diff --git a/recipes/mlibc-headers b/recipes/mlibc-headers index 48c12a288..b53afc3a8 100644 --- a/recipes/mlibc-headers +++ b/recipes/mlibc-headers @@ -17,7 +17,4 @@ build() { package() { DESTDIR="${dest_dir}" ninja install - - # Required for V - cp ${source_dir}/options/linux/include/sys/ptrace.h "${dest_dir}${prefix}"/include/sys/ } diff --git a/recipes/v b/recipes/v index 62e1e5a69..7c6511825 100644 --- a/recipes/v +++ b/recipes/v @@ -11,6 +11,7 @@ deps="core-libs" prepare() { curl -o v.c https://raw.githubusercontent.com/vlang/vc/b0d373373845541b811b4ba38d48d75c0fbe7240/v.c + patch -p0 <"${base_dir}"/build-support/v/v.c.patch } build() {