From e8355df0b69fb7d5a9578979b007447568a35938 Mon Sep 17 00:00:00 2001 From: Matheus Date: Sat, 9 Sep 2023 00:32:36 -0300 Subject: [PATCH] ports: fix bash recipe and stub a few signal sysdeps in mlibc --- patches/mlibc/jinx-working-patch.patch | 16 ++++++++++++++-- recipes/bash | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/patches/mlibc/jinx-working-patch.patch b/patches/mlibc/jinx-working-patch.patch index e2051ef0..cad60b10 100644 --- a/patches/mlibc/jinx-working-patch.patch +++ b/patches/mlibc/jinx-working-patch.patch @@ -170,10 +170,10 @@ index 0000000..e5b087a + diff --git mlibc-workdir/sysdeps/astral/generic/generic.cpp mlibc-workdir/sysdeps/astral/generic/generic.cpp new file mode 100644 -index 0000000..310a6df +index 0000000..8029348 --- /dev/null +++ mlibc-workdir/sysdeps/astral/generic/generic.cpp -@@ -0,0 +1,501 @@ +@@ -0,0 +1,513 @@ +#include +#include +#include @@ -292,6 +292,18 @@ index 0000000..310a6df + return 0; + } + ++ int sys_sigprocmask(int how, const sigset_t *__restrict set, ++ sigset_t *__restrict retrieve) { ++ mlibc::infoLogger() << "mlibc: sigprocmask is a stub" << frg::endlog; ++ return 0; ++ } ++ ++ int sys_sigaction(int, const struct sigaction *__restrict, ++ struct sigaction *__restrict) { ++ mlibc::infoLogger() << "mlibc: sigaction is a stub" << frg::endlog; ++ return 0; ++ } ++ + int sys_utimensat(int dirfd, const char *pathname, const struct timespec times[2], int flags) { + long ret; + return syscall(SYSCALL_UTIMENSAT, &ret, dirfd, (uint64_t)pathname, (uint64_t)times, flags); diff --git a/recipes/bash b/recipes/bash index fc3e45b6..419d327b 100644 --- a/recipes/bash +++ b/recipes/bash @@ -6,7 +6,8 @@ hostdeps="xgcc xbinutils" deps="readline mlibc" configure() { - ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --without-bash-malloc + cp -rp ${source_dir}/* . + ./configure --host=x86_64-astral --prefix=${prefix} --without-bash-malloc } build() {