ports: use upstream mlibc astral sysdep

recipes/cxxshim

@@ -1,15 +0,0 @@
-name=cxxshim
-from_source=cxxshim
-revision=1
-hostdeps="xgcc xbinutils pkgconfig"
-imagedeps="meson ninja base-devel"
-
-build() {
-        meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} -Dinstall_headers=true ${source_dir} --includedir="share/mlibc-build/cxxshim/include"
-        ninja
-}
-
-package() {
-        DESTDIR=${dest_dir} ninja install
-}
-

recipes/freestnd-c-hdrs

@@ -0,0 +1,12 @@
+name=freestnd-c-hdrs
+from_source=freestnd-c-hdrs
+revision=1
+
+build() {
+	cp -rp "${source_dir}"/. ./
+}
+
+package() {
+        make install DESTDIR="${dest_dir}" PREFIX="${prefix}"
+}
+

recipes/freestnd-cxx-hdrs

@@ -0,0 +1,12 @@
+name=freestnd-cxx-hdrs
+from_source=freestnd-cxx-hdrs
+revision=1
+
+build() {
+	cp -rp "${source_dir}"/. ./
+}
+
+package() {
+        make install DESTDIR="${dest_dir}" PREFIX="${prefix}"
+}
+

recipes/mlibc

@@ -2,12 +2,12 @@ name=mlibc
 from_source=mlibc
 revision=1
 hostdeps="xgcc xbinutils pkgconfig"
-builddeps="cxxshim frigg"
+builddeps="freestnd-c-hdrs freestnd-cxx-hdrs frigg"
 imagedeps="meson ninja git base-devel binutils"
 deps="mlibc-headers"
 
 build() {
-        meson --cross-file ${base_dir}/util/crossfile -Dmlibc_no_headers=true --prefix=${prefix} ${source_dir} -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include
+        meson --cross-file ${base_dir}/util/crossfile -Dmlibc_no_headers=true --prefix=${prefix} ${source_dir} -Dlinux_kernel_headers=${sysroot_dir}/${prefix}/include -Ddisable_crypt_option=true -Ddisable_iconv_option=true -Ddisable_intl_option=true
         ninja
 }
 

recipes/mlibc-headers

@@ -5,7 +5,7 @@ imagedeps="ninja meson base-devel rsync"
 builddeps="linux-headers"
 
 build() {
-	meson setup --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}"  -Dheaders_only=true "${source_dir}" 
+	meson setup --cross-file "${base_dir}/util/crossfile" --prefix="${prefix}"  -Dheaders_only=true "${source_dir}" -Ddisable_crypt_option=true -Ddisable_iconv_option=true -Ddisable_intl_option=true
 	ninja
 	mkdir linux
 	cp -rp ${base_dir}/sources/linux/* linux

recipes/nano

@@ -2,7 +2,7 @@ name=nano
 revision=1
 from_source=nano
 imagedeps="base-devel"
-hostdeps="xgcc xbinutils"
+hostdeps="xgcc xbinutils pkgconfig libtool"
 deps="base ncurses"
 
 build() {

recipes/ncurses

@@ -2,7 +2,7 @@ name=ncurses
 revision=1
 from_source=ncurses
 imagedeps="base-devel"
-hostdeps="xgcc xbinutils libstdc++-v3"
+hostdeps="xgcc xbinutils libstdc++-v3 pkgconfig libtool"
 deps="base"
 
 build() {

recipes/tar

@@ -7,8 +7,8 @@ deps="base bzip2 zlib gzip"
 
 build() {
 	cp -rpf ${source_dir}/* .
-	./configure --host=x86_64-astral --prefix=${prefix}
-	make -j ${parallelism} LDFLAGS="-lintl -liconv"
+	LDFLAGS="${LDFLAGS} -lintl -liconv" ./configure --host=x86_64-astral --prefix=${prefix}
+	make -j ${parallelism}
 }
 
 package() {

source-recipes/cxxshim

@@ -1,9 +0,0 @@
-name=cxxshim
-version=9325f9f75672e50a4fbab5bef3b57c9c02705725
-source_method=tarball
-tarball_url="https://github.com/managarm/cxxshim/archive/${version}.tar.gz"
-tarball_sha512=9f7f5d1b8ec1ca5281be622e28798395a5e3246601be7e59d511b57b20f7be80b9be8c06df42db71c1cbb00f7d85cea87ce34ca22acb56ed6ab49f1bba46409e
-
-regenerate() {
-	true
-}

source-recipes/freestnd-c-hdrs

@@ -0,0 +1,9 @@
+name=freestnd-c-hdrs
+version=2a75fc37ab374e52bd5862adb785169cc26cdb50
+source_method=tarball
+tarball_url="https://github.com/osdev0/freestnd-c-hdrs/archive/${version}.tar.gz"
+tarball_sha512=87f5e1d98539142da216766a269792ae4ee0a02abd02e8af45c33514866a408e01eca03bd6122574b3000b2234ab40f31c846a99d882162c6ecd89d0b08779e8
+
+regenerate() {
+	true
+}

source-recipes/freestnd-cxx-hdrs

@@ -0,0 +1,9 @@
+name=freestnd-cxx-hdrs
+version=34b801a8d6b601bf17b00df36fa82614e5be811d
+source_method=tarball
+tarball_url="https://github.com/osdev0/freestnd-cxx-hdrs/archive/${version}.tar.gz"
+tarball_sha512=39e25168ba5dcfad0b222c82d84d9c01337c989afb3aaaf61be4bef71cde0e7f618e7a6ab475b0b6372ef95b47ab915c4f4c61182a1292f04083fa4b24714569
+
+regenerate() {
+	true
+}

source-recipes/frigg

@@ -1,8 +1,8 @@
 name=frigg
-version=edf7b21dc7b5db709ef41f895a252a50c3db87e3
+version=91ada7d4e12b9e73a454e7be13919e989444faa2
 source_method=tarball
 tarball_url="https://github.com/managarm/frigg/archive/${version}.tar.gz"
-tarball_sha512=9a552e227ea7395916ac1edac7dd43b3ee2d7fb8ebc8ede400be40c57e36f80a577e087ecee7f10df062f7b66da0050ff29d24d0e61574303f6c7f06ecac8e5e
+tarball_sha512=d7011bcb0b2adfe88968de7cf9080fc71664725784491e66266b34b7fd83c2e3005f8ba7b530116075a7f5f7b31103af9aef1b32dab3143ed9ae3a247d2aa655
 
 regenerate() {
 	true

source-recipes/libtool

@@ -8,7 +8,5 @@ imagedeps="base-devel help2man wget"
 allow_network="yes"
 
 regenerate() {
-	wget https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-4b17a1ae49e69df1ac5dc35a4f60b20ab958baf2.tar.gz
-	tar -xf gnulib-4b17a1ae49e69df1ac5dc35a4f60b20ab958baf2.tar.gz
-	./bootstrap --force --skip-git --skip-po --gnulib-srcdir=`pwd`/gnulib-4b17a1ae49e69df1ac5dc35a4f60b20ab958baf2
+	true
 }

source-recipes/mlibc

@@ -1,10 +1,9 @@
 name=mlibc
-version=fee1ca4a2e6a397040ea2647875c1146e5f0e564
+version=b842be7802f53dea7c5700512d20d6471831e3c7
 source_method=tarball
 tarball_url="https://github.com/managarm/mlibc/archive/${version}.tar.gz"
-tarball_sha512="01834b5f109f6040a991c8edfa96dcab7d33fe3dae06738230af16ecfa402dc4219d4c3e79ff8d6deafa52a498bd4781848b42becf316f206385b20092e9f24f"
+tarball_sha512="0fe5f95771f37d6d57eb2f5b22d156dbd746b77c444e7c7cc065ae6fe51c646c2e03575960ab16fba79abb447fce30950d2201a09c6e0290d405e1eab94d3ffd"
 
 regenerate() {
-	mkdir -p ${source_dir}/sysdeps/astral/include/
-	ln -sv ../../../abis/linux/ ${source_dir}/sysdeps/astral/include/abi-bits
+	true
 }