mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-02 07:28:21 +00:00
mlibc: bump
This commit is contained in:
@@ -1,3 +1,23 @@
|
|||||||
|
diff --git mlibc-clean/options/ansi/generic/wchar.cpp mlibc-workdir/options/ansi/generic/wchar.cpp
|
||||||
|
index b44ebc2..9339316 100644
|
||||||
|
--- mlibc-clean/options/ansi/generic/wchar.cpp
|
||||||
|
+++ mlibc-workdir/options/ansi/generic/wchar.cpp
|
||||||
|
@@ -54,8 +54,13 @@ size_t mbrlen(const char *__restrict mbs, size_t mb_limit, mbstate_t *__restrict
|
||||||
|
|
||||||
|
mlibc::code_seq<const char> nseq{mbs, mbs + mb_limit};
|
||||||
|
mlibc::code_seq<wchar_t> wseq{&wc, &wc + 1};
|
||||||
|
- if(auto e = cc->decode_wtranscode(nseq, wseq, *stp); e != mlibc::charcode_error::null)
|
||||||
|
- __ensure(!"decode_wtranscode() errors are not handled");
|
||||||
|
+ if(auto e = cc->decode_wtranscode(nseq, wseq, *stp); e != mlibc::charcode_error::null) {
|
||||||
|
+ if(e == mlibc::charcode_error::input_underflow)
|
||||||
|
+ return static_cast<size_t>(-1);
|
||||||
|
+ __ensure(e == mlibc::charcode_error::illegal_input);
|
||||||
|
+ errno = EILSEQ;
|
||||||
|
+ return static_cast<size_t>(-1);
|
||||||
|
+ }
|
||||||
|
return nseq.it - mbs;
|
||||||
|
}
|
||||||
|
|
||||||
diff --git mlibc-clean/options/glibc/generic/execinfo.cpp mlibc-workdir/options/glibc/generic/execinfo.cpp
|
diff --git mlibc-clean/options/glibc/generic/execinfo.cpp mlibc-workdir/options/glibc/generic/execinfo.cpp
|
||||||
index 1ed110d..ded9114 100644
|
index 1ed110d..ded9114 100644
|
||||||
--- mlibc-clean/options/glibc/generic/execinfo.cpp
|
--- mlibc-clean/options/glibc/generic/execinfo.cpp
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
name=libsmarter
|
||||||
|
from_source=libsmarter
|
||||||
|
revision=1
|
||||||
|
hostdeps="xgcc xbinutils pkgconfig"
|
||||||
|
imagedeps="meson ninja-build build-essential"
|
||||||
|
|
||||||
|
configure() {
|
||||||
|
meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} ${source_dir} --includedir="share/mlibc-build/libsmarter/include"
|
||||||
|
}
|
||||||
|
|
||||||
|
build() {
|
||||||
|
ninja
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
DESTDIR=${dest_dir} ninja install
|
||||||
|
}
|
||||||
|
|
||||||
+1
-1
@@ -2,7 +2,7 @@ name=mlibc
|
|||||||
from_source=mlibc
|
from_source=mlibc
|
||||||
revision=1
|
revision=1
|
||||||
hostdeps="xgcc xbinutils pkgconfig"
|
hostdeps="xgcc xbinutils pkgconfig"
|
||||||
builddeps="freestnd-c-hdrs freestnd-cxx-hdrs frigg"
|
builddeps="freestnd-c-hdrs freestnd-cxx-hdrs frigg libsmarter"
|
||||||
imagedeps="meson ninja-build git build-essential binutils"
|
imagedeps="meson ninja-build git build-essential binutils"
|
||||||
deps="mlibc-headers"
|
deps="mlibc-headers"
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
name=frigg
|
name=frigg
|
||||||
version=a07d90225def2c6177f0cc271bfff62e466b04eb
|
version=6355f7677fa39156aeb77603d246d977531e28ee
|
||||||
source_method=tarball
|
source_method=tarball
|
||||||
tarball_url="https://github.com/managarm/frigg/archive/${version}.tar.gz"
|
tarball_url="https://github.com/managarm/frigg/archive/${version}.tar.gz"
|
||||||
tarball_sha512=c4bf752a26233bd4b57a8bf4abe3d78c9dd5193d8dc2f9d86ea5f9c9f0f9220eccf73b95016cd22b807501ad46c9cfd0e22e86b157f5bf64c1a8e158dd2c6b53
|
tarball_sha512=48bba34936929886bb240758bcd8b8bf2408152a56172a1cbbcca05ee76bc55f04b3c8cb7a11cdb1e5f1017fd4557ca8e23585b3735182796935f78c3aa7f13f
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
true
|
true
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
name=libsmarter
|
||||||
|
version=338cce63b22c85557c9274ad8ecfc8423a14024d
|
||||||
|
source_method=tarball
|
||||||
|
tarball_url="https://github.com/managarm/libsmarter/archive/${version}.tar.gz"
|
||||||
|
tarball_sha512=1e890b46ede79f7b6ca765925173795a6e9d18f01337422b12a754db4c646856eb9ab6b0944d149a697cace0f5877d6d65eb6f904c2a619981226591241e5ae6
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
true
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
name=mlibc
|
name=mlibc
|
||||||
version=774251b74b11a7fe4d3fce9ea45d2e9c56e1f478
|
version=d6a7ab7b9a17e3b8e40ba32dd41a9dc7c394434e
|
||||||
source_method=tarball
|
source_method=tarball
|
||||||
tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz"
|
tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz"
|
||||||
tarball_sha512="0373862e379c4eff992a77ba2b12fe74840c210318045b1f3bbfe061b33a3a873630cc2bac5692f00ff7e111505fc7e310beb02664ae6038418469e3461f7c02"
|
tarball_sha512="6f96f66a3840e70c24a68f39fe438ba12ee64120921278572579958b34e37398872a049acaf0385907c33441c105b2cb2b7664bfbb5b7529a750bff892787ee9"
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
true
|
true
|
||||||
|
|||||||
Reference in New Issue
Block a user