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() {