diff --git a/Makefile b/Makefile index 1a23f3d2..9ce6d6b5 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ clean-kernel: find builds/astral/ -name *.asmo -delete clean: - make clean-kernel + make -i clean-kernel ./jinx clean rm jinx rm -rf $(ISODIR) diff --git a/host-recipes/util-macros b/host-recipes/util-macros index f0357c3e..60e2c0c2 100644 --- a/host-recipes/util-macros +++ b/host-recipes/util-macros @@ -3,7 +3,7 @@ revision=1 from_source=util-macros imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { diff --git a/host-recipes/xtrans b/host-recipes/xtrans index 186a0af1..46137a22 100644 --- a/host-recipes/xtrans +++ b/host-recipes/xtrans @@ -3,7 +3,7 @@ revision=1 from_source=xtrans imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} diff --git a/recipes/ace-of-penguins b/recipes/ace-of-penguins index 4b4fc69f..383e23c9 100644 --- a/recipes/ace-of-penguins +++ b/recipes/ace-of-penguins @@ -3,7 +3,7 @@ revision=1 from_source=ace-of-penguins imagedeps="meson ninja base-devel libpng" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxpm libpng zlib" +deps="base libx11 libxpm libpng zlib" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/base b/recipes/base new file mode 100644 index 00000000..b23453fd --- /dev/null +++ b/recipes/base @@ -0,0 +1,3 @@ +name=base +revision=1 +deps="mlibc libintl libiconv libxcrypt" diff --git a/recipes/bash b/recipes/bash index 86d3b748..3e7fe85e 100644 --- a/recipes/bash +++ b/recipes/bash @@ -3,7 +3,7 @@ revision=1 from_source=bash imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="readline mlibc" +deps="readline base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/binutils b/recipes/binutils index 29711abb..ca7547c0 100644 --- a/recipes/binutils +++ b/recipes/binutils @@ -3,7 +3,7 @@ revision=1 from_source=binutils imagedeps="base-devel" hostdeps="xgcc xbinutils automake autoconf" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --disable-werror diff --git a/recipes/bzip2 b/recipes/bzip2 index 2dcfec07..8e4648af 100644 --- a/recipes/bzip2 +++ b/recipes/bzip2 @@ -3,7 +3,7 @@ revision=1 from_source=bzip2 imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rpf ${source_dir}/* . diff --git a/recipes/coreutils b/recipes/coreutils index b3d3afa6..b8accff5 100644 --- a/recipes/coreutils +++ b/recipes/coreutils @@ -3,7 +3,7 @@ revision=1 from_source=coreutils imagedeps="base-devel gperf" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -pr ${source_dir}/* . diff --git a/recipes/curl b/recipes/curl index 0c3b93fb..5079ac8b 100644 --- a/recipes/curl +++ b/recipes/curl @@ -3,7 +3,7 @@ revision=1 from_source=curl imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc openssl zlib" +deps="base openssl zlib" build() { cp -rpv ${source_dir}/* . diff --git a/recipes/diffutils b/recipes/diffutils index f718aa15..e64bed40 100644 --- a/recipes/diffutils +++ b/recipes/diffutils @@ -3,7 +3,7 @@ revision=1 from_source=diffutils imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/doomgeneric b/recipes/doomgeneric index 7bfbd30f..dc7f7e4c 100644 --- a/recipes/doomgeneric +++ b/recipes/doomgeneric @@ -3,7 +3,7 @@ revision=1 from_source=doomgeneric imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/doomgeneric/* . diff --git a/recipes/doomgeneric-x11 b/recipes/doomgeneric-x11 index 9ff93e65..fecd1b7a 100644 --- a/recipes/doomgeneric-x11 +++ b/recipes/doomgeneric-x11 @@ -3,7 +3,7 @@ revision=1 from_source=doomgeneric imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc libx11" +deps="base libx11" build() { cp -rp ${source_dir}/doomgeneric/* . diff --git a/recipes/e2fsprogs b/recipes/e2fsprogs index 26d7862b..7a75df54 100644 --- a/recipes/e2fsprogs +++ b/recipes/e2fsprogs @@ -3,7 +3,7 @@ revision=1 from_source=e2fsprogs imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/file b/recipes/file index 56583b77..e28f9efb 100644 --- a/recipes/file +++ b/recipes/file @@ -3,7 +3,7 @@ revision=1 from_source=file imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/findutils b/recipes/findutils index 43dc924a..416a4d7b 100644 --- a/recipes/findutils +++ b/recipes/findutils @@ -3,7 +3,7 @@ revision=1 from_source=findutils imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/fontconfig b/recipes/fontconfig index b2ac0071..e9804674 100644 --- a/recipes/fontconfig +++ b/recipes/fontconfig @@ -3,7 +3,7 @@ revision=1 from_source=fontconfig imagedeps="base-devel python3 gperf" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc freetype libexpat" +deps="base freetype libexpat" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/fontutil b/recipes/fontutil index a1f76620..b72f4dd4 100644 --- a/recipes/fontutil +++ b/recipes/fontutil @@ -3,7 +3,7 @@ revision=1 from_source=fontutil imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto" +deps="base xorgproto" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/freetype b/recipes/freetype index 6adab9c7..033049c6 100644 --- a/recipes/freetype +++ b/recipes/freetype @@ -3,7 +3,7 @@ revision=1 from_source=freetype imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/fvwm b/recipes/fvwm index 738c78e9..edfcf87a 100644 --- a/recipes/fvwm +++ b/recipes/fvwm @@ -3,7 +3,7 @@ revision=1 from_source=fvwm imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxinerama libxcursor libxt libevent libxrandr freetype libpng libxft" +deps="base libx11 libxinerama libxcursor libxt libevent libxrandr freetype libpng libxft" build() { cp -rvp ${source_dir}/* . diff --git a/recipes/gawk b/recipes/gawk index 8dd4c4a5..ffec69aa 100644 --- a/recipes/gawk +++ b/recipes/gawk @@ -3,7 +3,7 @@ revision=1 from_source=gawk imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/gcc b/recipes/gcc index b6eacf66..b9b7af25 100644 --- a/recipes/gcc +++ b/recipes/gcc @@ -3,7 +3,7 @@ revision=1 from_source=gcc imagedeps="base-devel" hostrundeps="automake autoconf xgcc xbinutils libstdc++-v3" -deps="mlibc gmp mpfr mpc binutils" +deps="base gmp mpfr mpc binutils" build() { ${source_dir}/configure --host=x86_64-astral --target=x86_64-astral --prefix=${prefix} --enable-languages=c,c++ --with-sysroot=/ --with-build-sysroot=${sysroot_dir} diff --git a/recipes/gettext b/recipes/gettext index c0219a2c..940d46d8 100644 --- a/recipes/gettext +++ b/recipes/gettext @@ -3,7 +3,7 @@ revision=1 from_source=gettext imagedeps="base-devel" hostdeps="xgcc xbinutils autoconf automake pkgconfig libtool" -deps="mlibc libiconv" +deps="base libiconv" build() { cp -rp ${source_dir}/* . diff --git a/recipes/git b/recipes/git index 37a97339..f1152c46 100644 --- a/recipes/git +++ b/recipes/git @@ -3,7 +3,7 @@ revision=1 from_source=git imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc python zlib curl openssl openssh" +deps="base python zlib curl openssl openssh" build() { cp -rp ${source_dir}/* . diff --git a/recipes/glib b/recipes/glib index 5a782eb3..f73461f2 100644 --- a/recipes/glib +++ b/recipes/glib @@ -3,7 +3,7 @@ revision=1 from_source=glib imagedeps="gcc meson ninja" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" -deps="mlibc libiconv pcre2 libffi libintl" +deps="base libiconv pcre2 libffi libintl" build() { meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release -Dxattr=false ${source_dir} diff --git a/recipes/glu b/recipes/glu index 0ea9a23f..5a69f126 100644 --- a/recipes/glu +++ b/recipes/glu @@ -3,7 +3,7 @@ revision=1 from_source=glu imagedeps="gcc meson ninja" hostdeps="xgcc xbinutils pkgconfig libtool libstdc++-v3" -deps="mlibc mesa" +deps="base mesa" build() { meson setup --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release ${source_dir} -Dgl_provider=gl diff --git a/recipes/gmp b/recipes/gmp index 31cd8deb..a36bb41b 100644 --- a/recipes/gmp +++ b/recipes/gmp @@ -3,7 +3,7 @@ revision=1 from_source=gmp imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/grep b/recipes/grep index e37cc7cd..0648ffb1 100644 --- a/recipes/grep +++ b/recipes/grep @@ -3,7 +3,7 @@ revision=1 from_source=grep imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/gzip b/recipes/gzip index 111df3e8..1a42621f 100644 --- a/recipes/gzip +++ b/recipes/gzip @@ -3,7 +3,7 @@ revision=1 from_source=gzip imagedeps="base-devel" hostdeps="xgcc xbinutils automake autoconf" -deps="mlibc" +deps="base" build() { cp -rf ${source_dir}/* . diff --git a/recipes/init b/recipes/init index e2542d8e..8ebc7b2b 100644 --- a/recipes/init +++ b/recipes/init @@ -3,7 +3,7 @@ revision=1 from_source=init imagedeps="base-devel" hostdeps="xbinutils xgcc" -deps="mlibc" +deps="base" build() { make -C ${source_dir} -j ${parallelism} diff --git a/recipes/install-astral b/recipes/install-astral index 8116d8cc..aa45c829 100644 --- a/recipes/install-astral +++ b/recipes/install-astral @@ -3,7 +3,7 @@ revision=1 from_source=install-astral imagedeps="base-devel" hostdeps="xbinutils xgcc" -deps="mlibc" +deps="base" build() { make -C ${source_dir} -j ${parallelism} diff --git a/recipes/less b/recipes/less index 786df07c..c41a161a 100644 --- a/recipes/less +++ b/recipes/less @@ -3,7 +3,7 @@ revision=1 from_source=less imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc ncurses" +deps="base ncurses" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/libXau b/recipes/libXau index 2cfed516..16efa297 100644 --- a/recipes/libXau +++ b/recipes/libXau @@ -3,7 +3,7 @@ revision=1 from_source=libXau imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto" +deps="base xorgproto" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/libXdmcp b/recipes/libXdmcp index a1c860c0..095ada0e 100644 --- a/recipes/libXdmcp +++ b/recipes/libXdmcp @@ -3,7 +3,7 @@ revision=1 from_source=libXdmcp imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto" +deps="base xorgproto" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/libevent b/recipes/libevent index 9434da40..5475504a 100644 --- a/recipes/libevent +++ b/recipes/libevent @@ -3,7 +3,7 @@ revision=1 from_source=libevent imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static --enable-shared --disable-openssl diff --git a/recipes/libexpat b/recipes/libexpat index 71b21ace..ec59fb58 100644 --- a/recipes/libexpat +++ b/recipes/libexpat @@ -3,7 +3,7 @@ revision=1 from_source=libexpat imagedeps="base-devel python3" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libffi b/recipes/libffi index 5ba27559..7276f59d 100644 --- a/recipes/libffi +++ b/recipes/libffi @@ -3,7 +3,7 @@ revision=1 from_source=libffi imagedeps="base-devel" hostdeps="xgcc xbinutils autoconf automake pkgconfig libtool" -deps="mlibc ncurses" +deps="base ncurses" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static --enable-shared diff --git a/recipes/libfontenc b/recipes/libfontenc index 4668c18f..754f4d96 100644 --- a/recipes/libfontenc +++ b/recipes/libfontenc @@ -3,7 +3,7 @@ revision=1 from_source=libfontenc imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc zlib xorgproto" +deps="base zlib xorgproto" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/libgcrypt b/recipes/libgcrypt index 80089f78..66a50fc4 100644 --- a/recipes/libgcrypt +++ b/recipes/libgcrypt @@ -3,7 +3,7 @@ revision=1 from_source=libgcrypt imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig libtool" -deps="mlibc libgpg-error" +deps="base libgpg-error" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral \ diff --git a/recipes/libice b/recipes/libice index d6b6fdef..e7210f0c 100644 --- a/recipes/libice +++ b/recipes/libice @@ -3,7 +3,7 @@ revision=1 from_source=libice imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11" +deps="base libx11" build() { diff --git a/recipes/libintl b/recipes/libintl index 6abcbf1b..c5a51c08 100644 --- a/recipes/libintl +++ b/recipes/libintl @@ -3,7 +3,7 @@ revision=1 from_source=gettext imagedeps="base-devel" hostdeps="xgcc xbinutils libstdc++-v3 automake autoconf pkgconfig libtool" -deps="mlibc" +deps="mlibc libiconv" build() { cp -rp ${source_dir}/* . diff --git a/recipes/libjpeg-turbo b/recipes/libjpeg-turbo index 616d2f9f..298181c5 100644 --- a/recipes/libjpeg-turbo +++ b/recipes/libjpeg-turbo @@ -3,7 +3,7 @@ revision=1 from_source=libjpeg-turbo imagedeps="base-devel" hostdeps="xgcc xbinutils cmake" -deps="mlibc" +deps="base" build() { cmake \ diff --git a/recipes/libpng b/recipes/libpng index 4accd7f1..e0098418 100644 --- a/recipes/libpng +++ b/recipes/libpng @@ -3,7 +3,7 @@ revision=1 from_source=libpng imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc zlib" +deps="base zlib" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static diff --git a/recipes/libsm b/recipes/libsm index 99bcb7ce..23574d98 100644 --- a/recipes/libsm +++ b/recipes/libsm @@ -3,7 +3,7 @@ revision=1 from_source=libsm imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc xorgproto libx11 libice" +deps="base xorgproto libx11 libice" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libx11 b/recipes/libx11 index 7ae11fe0..330c4abe 100644 --- a/recipes/libx11 +++ b/recipes/libx11 @@ -3,7 +3,7 @@ revision=1 from_source=libx11 imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto xtrans libxcb" +deps="base xorgproto xtrans libxcb" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull diff --git a/recipes/libxaw b/recipes/libxaw index ce69a709..4ed68513 100644 --- a/recipes/libxaw +++ b/recipes/libxaw @@ -3,7 +3,7 @@ revision=1 from_source=libxaw imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxt libxext libxmu libxpm" +deps="base libx11 libxt libxext libxmu libxpm" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libxcb b/recipes/libxcb index 475a682d..7316518a 100644 --- a/recipes/libxcb +++ b/recipes/libxcb @@ -3,7 +3,7 @@ revision=1 from_source=libxcb imagedeps="python gcc" hostdeps="xgcc xbinutils pkgconfig util-macros libtool autoconf automake" -deps="mlibc xorgproto libXau libXdmcp xcb-proto" +deps="base xorgproto libXau libXdmcp xcb-proto" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-static --with-sysroot=${sysroot_dir} diff --git a/recipes/libxcrypt b/recipes/libxcrypt index e139395e..8cb53e56 100644 --- a/recipes/libxcrypt +++ b/recipes/libxcrypt @@ -3,7 +3,7 @@ revision=1 from_source=libxcrypt imagedeps="python-passlib gcc" hostdeps="xgcc xbinutils pkgconfig libtool" -deps="mlibc libgpg-error" +deps="mlibc libgpg-error libiconv libintl" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-obsolete-api=yes --disable-xcrypt-compat-files diff --git a/recipes/libxcursor b/recipes/libxcursor index 6f63edb5..cf631931 100644 --- a/recipes/libxcursor +++ b/recipes/libxcursor @@ -3,7 +3,7 @@ revision=1 from_source=libxcursor imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libxrender libxfixes libx11" +deps="base libxrender libxfixes libx11" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/libxcvt b/recipes/libxcvt index adc4b3de..19c8158c 100644 --- a/recipes/libxcvt +++ b/recipes/libxcvt @@ -3,7 +3,7 @@ revision=1 from_source=libxcvt imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { meson --cross-file=${base_dir}/util/crossfile --prefix=${prefix} ${source_dir} diff --git a/recipes/libxdamage b/recipes/libxdamage index 85920319..2f79bc8d 100644 --- a/recipes/libxdamage +++ b/recipes/libxdamage @@ -3,7 +3,7 @@ revision=1 from_source=libxdamage imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxfixes" +deps="base libx11 libxfixes" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull diff --git a/recipes/libxext b/recipes/libxext index 0d528eb5..c92c92a5 100644 --- a/recipes/libxext +++ b/recipes/libxext @@ -3,7 +3,7 @@ revision=1 from_source=libxext imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11" +deps="base libx11" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull diff --git a/recipes/libxfixes b/recipes/libxfixes index d228ab00..7179c6d4 100644 --- a/recipes/libxfixes +++ b/recipes/libxfixes @@ -3,7 +3,7 @@ revision=1 from_source=libxfixes imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11" +deps="base libx11" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libxfont2 b/recipes/libxfont2 index 7bba212f..7d2ca98b 100644 --- a/recipes/libxfont2 +++ b/recipes/libxfont2 @@ -3,7 +3,7 @@ revision=1 from_source=libxfont2 imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto freetype zlib xtrans libfontenc" +deps="base xorgproto freetype zlib xtrans libfontenc" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull diff --git a/recipes/libxft b/recipes/libxft index 4cfdf7b6..174b2020 100644 --- a/recipes/libxft +++ b/recipes/libxft @@ -3,7 +3,7 @@ revision=1 from_source=libxft imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxt libxrender freetype fontconfig" +deps="base libx11 libxt libxrender freetype fontconfig" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libxi b/recipes/libxi index bc8fdf94..3c3728b9 100644 --- a/recipes/libxi +++ b/recipes/libxi @@ -3,7 +3,7 @@ revision=1 from_source=libxi imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxext libxfixes" +deps="base libx11 libxext libxfixes" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull diff --git a/recipes/libxinerama b/recipes/libxinerama index e8009615..fb5d44a3 100644 --- a/recipes/libxinerama +++ b/recipes/libxinerama @@ -3,7 +3,7 @@ revision=1 from_source=libxinerama imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc xorgproto libx11 libxext" +deps="base xorgproto libx11 libxext" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull diff --git a/recipes/libxmu b/recipes/libxmu index 839d0675..9fc57544 100644 --- a/recipes/libxmu +++ b/recipes/libxmu @@ -3,7 +3,7 @@ revision=1 from_source=libxmu imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxt libxext" +deps="base libx11 libxt libxext" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libxpm b/recipes/libxpm index 4987b231..f0495d96 100644 --- a/recipes/libxpm +++ b/recipes/libxpm @@ -3,7 +3,7 @@ revision=1 from_source=libxpm imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 libxt libxext libxmu libxrender" +deps="base libx11 libxt libxext libxmu libxrender" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static diff --git a/recipes/libxrandr b/recipes/libxrandr index ab4c1c24..eb448587 100644 --- a/recipes/libxrandr +++ b/recipes/libxrandr @@ -3,7 +3,7 @@ revision=1 from_source=libxrandr imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc libx11 xorgproto util-macros libxext libxrender" +deps="base libx11 xorgproto util-macros libxext libxrender" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-malloc0returnsnull diff --git a/recipes/libxrender b/recipes/libxrender index 1b1bc697..10607645 100644 --- a/recipes/libxrender +++ b/recipes/libxrender @@ -3,7 +3,7 @@ revision=1 from_source=libxrender imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11" +deps="base libx11" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull diff --git a/recipes/libxt b/recipes/libxt index 01c39a3e..0d9aa822 100644 --- a/recipes/libxt +++ b/recipes/libxt @@ -3,7 +3,7 @@ revision=1 from_source=libxt imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc xorgproto libx11 libice libsm" +deps="base xorgproto libx11 libice libsm" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull diff --git a/recipes/libxxf86vm b/recipes/libxxf86vm index 21112a23..f8e66dc2 100644 --- a/recipes/libxxf86vm +++ b/recipes/libxxf86vm @@ -3,7 +3,7 @@ revision=1 from_source=libxxf86vm imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc libxext xorgproto" +deps="base libxext xorgproto" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-shared --disable-static --disable-malloc0returnsnull diff --git a/recipes/limine b/recipes/limine index 893dcf17..b598ceb1 100644 --- a/recipes/limine +++ b/recipes/limine @@ -3,7 +3,7 @@ from_source=limine revision=1 imagedeps="base-devel mtools nasm" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { "${source_dir}/configure" --host=x86_64-astral --enable-bios-cd --enable-bios-pxe --enable-bios --enable-uefi-ia32 --enable-uefi-x86-64 --enable-uefi-cd --prefix="${prefix}" diff --git a/recipes/links b/recipes/links index a09f8678..1b8d180a 100644 --- a/recipes/links +++ b/recipes/links @@ -3,7 +3,7 @@ revision=1 from_source=links imagedeps="meson ninja base-devel libpng" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc zlib openssl bzip2 libpng libxext freetype fontconfig libjpeg-turbo" +deps="base zlib openssl bzip2 libpng libxext freetype fontconfig libjpeg-turbo" build() { CC=x86_64-astral-gcc ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --enable-graphics --without-directfb --without-librsvg --with-bzip2 --with-X --x-includes=${sysroot_dir}/usr/include --x-libraries=${sysroot_dir}/usr/lib --with-zlib --with-openssl --without-libtiff --without-openmp --without-lzma --with-freetype --without-ipv6 diff --git a/recipes/llvm b/recipes/llvm index 6f99a2b8..2cae6d2c 100644 --- a/recipes/llvm +++ b/recipes/llvm @@ -3,7 +3,7 @@ revision=1 from_source=llvm imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig cmake libstdc++-v3" -deps="mlibc ncurses zlib" +deps="base ncurses zlib" build() { cmake \ diff --git a/recipes/make b/recipes/make index e08d95e4..1fa58be5 100644 --- a/recipes/make +++ b/recipes/make @@ -3,7 +3,7 @@ revision=1 from_source=make imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/mesa b/recipes/mesa index efacb35a..770c3e18 100644 --- a/recipes/mesa +++ b/recipes/mesa @@ -3,7 +3,7 @@ revision=1 from_source=mesa imagedeps="gcc meson ninja python-mako python-setuptools python-yaml" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool libstdc++-v3" -deps="mlibc llvm libexpat libxcb libx11 libxext zlib" +deps="base llvm libexpat libxcb libx11 libxext zlib" build() { cp -rp ${source_dir}/* . diff --git a/recipes/mesa-demos b/recipes/mesa-demos index 1b1530fc..ebb1b8b3 100644 --- a/recipes/mesa-demos +++ b/recipes/mesa-demos @@ -3,7 +3,7 @@ revision=1 from_source=mesa-demos imagedeps="gcc meson ninja" hostdeps="xgcc xbinutils pkgconfig libtool" -deps="mlibc mesa freetype libx11 libxext glu" +deps="base mesa freetype libx11 libxext glu" build() { meson setup --cross-file ${base_dir}/util/crossfile --prefix=${prefix} --buildtype=release ${source_dir} -Dx11=enabled -Dwith-system-data-files=true diff --git a/recipes/mkfontscale b/recipes/mkfontscale index 0c0d5cff..5a9d0c6f 100644 --- a/recipes/mkfontscale +++ b/recipes/mkfontscale @@ -3,7 +3,7 @@ revision=1 from_source=mkfontscale imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc freetype libfontenc" +deps="base freetype libfontenc" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/mount b/recipes/mount index 49f3511f..a55a0830 100644 --- a/recipes/mount +++ b/recipes/mount @@ -3,7 +3,7 @@ revision=1 from_source=mount imagedeps="base-devel" hostdeps="xbinutils xgcc" -deps="mlibc" +deps="base" build() { make -C ${source_dir} -j ${parallelism} diff --git a/recipes/mpc b/recipes/mpc index 54303ab4..7112d237 100644 --- a/recipes/mpc +++ b/recipes/mpc @@ -3,7 +3,7 @@ revision=1 from_source=mpc imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc gmp mpfr" +deps="base gmp mpfr" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/mpfr b/recipes/mpfr index e1f6273c..e296e065 100644 --- a/recipes/mpfr +++ b/recipes/mpfr @@ -3,7 +3,7 @@ revision=1 from_source=mpfr imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc gmp" +deps="base gmp" build() { cp -pr ${source_dir}/* . diff --git a/recipes/nano b/recipes/nano index a9692a6d..baf555fc 100644 --- a/recipes/nano +++ b/recipes/nano @@ -3,7 +3,7 @@ revision=1 from_source=nano imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc ncurses" +deps="base ncurses" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/nasm b/recipes/nasm index 27006e4f..f73d627a 100644 --- a/recipes/nasm +++ b/recipes/nasm @@ -3,7 +3,7 @@ revision=1 from_source=nasm imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/ncurses b/recipes/ncurses index c1c41dc1..2fed883e 100644 --- a/recipes/ncurses +++ b/recipes/ncurses @@ -3,7 +3,7 @@ revision=1 from_source=ncurses imagedeps="base-devel" hostdeps="xgcc xbinutils libstdc++-v3" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --with-shared --without-normal --with-termlib --enable-pc-files --enable-widec diff --git a/recipes/netd b/recipes/netd index 9b57e1aa..893a6acb 100644 --- a/recipes/netd +++ b/recipes/netd @@ -3,7 +3,7 @@ revision=1 from_source=netd imagedeps="base-devel" hostdeps="xbinutils xgcc" -deps="mlibc" +deps="base" build() { make -C ${source_dir} -j ${parallelism} diff --git a/recipes/nyancat b/recipes/nyancat index 1461a475..1bea34a9 100644 --- a/recipes/nyancat +++ b/recipes/nyancat @@ -3,7 +3,7 @@ revision=1 from_source=nyancat imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/openssh b/recipes/openssh index 14c454c8..19d6c511 100644 --- a/recipes/openssh +++ b/recipes/openssh @@ -3,7 +3,7 @@ revision=1 from_source=openssh imagedeps="gcc" hostdeps="xgcc xbinutils" -deps="mlibc zlib openssl libxcrypt" +deps="base zlib openssl libxcrypt" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --sysconfdir=/etc/ssh --with-privsep-path=/var/lib/sshd --with-default-path=${prefix}/bin --with-superuser-path=${prefix}/sbin:${prefix}/bin --with-pid-dir=/run diff --git a/recipes/openssl b/recipes/openssl index 95b55bf6..1e93a49b 100644 --- a/recipes/openssl +++ b/recipes/openssl @@ -3,7 +3,7 @@ revision=1 from_source=openssl imagedeps="gcc" hostdeps="xgcc xbinutils" -deps="mlibc zlib" +deps="base zlib" build() { cp -rpv ${source_dir}/* . diff --git a/recipes/oss b/recipes/oss index fb724f7b..69572382 100644 --- a/recipes/oss +++ b/recipes/oss @@ -3,7 +3,7 @@ revision=1 from_source=oss imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { ASTRAL_CC=x86_64-astral-gcc \ diff --git a/recipes/pcre2 b/recipes/pcre2 index 7f90c3a4..59ccf3dd 100644 --- a/recipes/pcre2 +++ b/recipes/pcre2 @@ -3,7 +3,7 @@ revision=1 from_source=pcre2 imagedeps="gcc" hostdeps="xgcc xbinutils" -deps="mlibc zlib bzip2" +deps="base zlib bzip2" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --docdir=/usr/share/doc/pcre2-10.42 --enable-pcre2-16 --enable-pcre2-32 --enable-pcre2grep-libz --enable-pcre2grep-libbz2 --disable-static diff --git a/recipes/pixman b/recipes/pixman index c37745c4..7637fba7 100644 --- a/recipes/pixman +++ b/recipes/pixman @@ -3,7 +3,7 @@ revision=1 from_source=pixman imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { meson --cross-file=${base_dir}/util/crossfile --prefix=${prefix} ${source_dir} diff --git a/recipes/python b/recipes/python index 633efc43..63f48351 100644 --- a/recipes/python +++ b/recipes/python @@ -3,7 +3,7 @@ revision=1 from_source=python imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig python" -deps="mlibc mlibc-headers" +deps="base" build() { echo "ac_cv_file__dev_ptmx=yes" > /tmp/configsite diff --git a/recipes/qemu b/recipes/qemu index a72a337e..538b9b3a 100644 --- a/recipes/qemu +++ b/recipes/qemu @@ -3,7 +3,7 @@ revision=1 from_source=qemu imagedeps="base-devel python-sphinx ninja meson git" hostdeps="xgcc xbinutils pkgconfig libtool" -deps="mlibc sdl2 glib libiconv libintl" +deps="base sdl2 glib libiconv libintl" allow_network="yes" build() { diff --git a/recipes/readline b/recipes/readline index 933af1ba..3d7063c5 100644 --- a/recipes/readline +++ b/recipes/readline @@ -3,7 +3,7 @@ revision=1 from_source=readline imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc ncurses" +deps="base ncurses" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --enable-multibyte --disable-static --enable-shared diff --git a/recipes/sdl2 b/recipes/sdl2 index 75f57166..3d5cad1a 100644 --- a/recipes/sdl2 +++ b/recipes/sdl2 @@ -3,7 +3,7 @@ revision=1 from_source=sdl2 imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig cmake libstdc++-v3" -deps="mlibc libx11 libxext libxcursor libxinerama libxi libxfixes libxrandr libxrender libxxf86vm mesa libiconv" +deps="base libx11 libxext libxcursor libxinerama libxi libxfixes libxrandr libxrender libxxf86vm mesa libiconv" build() { cmake \ diff --git a/recipes/sed b/recipes/sed index 44a6c8f8..a54c3605 100644 --- a/recipes/sed +++ b/recipes/sed @@ -3,7 +3,7 @@ revision=1 from_source=sed imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/shadow b/recipes/shadow index fba87e6a..b1803697 100644 --- a/recipes/shadow +++ b/recipes/shadow @@ -2,8 +2,8 @@ name=shadow revision=1 from_source=shadow imagedeps="base-devel" -hostdeps="xgcc xbinutils" -deps="mlibc libxcrypt" +hostdeps="xgcc xbinutils pkgconfig libtool" +deps="base libxcrypt" build() { cp -rvfp ${source_dir}/* . @@ -13,7 +13,7 @@ build() { find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \; sed -i 's/1000/999/' src/useradd.c sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' -e 's:/var/spool/mail:/var/mail:' -i etc/login.defs - ./configure --host=x86_64-astral --prefix=${prefix} --sysconfdir=/etc --with-group-name-max-length=32 --without-libbsd + ./configure --host=x86_64-astral --prefix=${prefix} --sysconfdir=/etc --with-group-name-max-length=32 --without-libbsd --disable-nls make -j ${parallelism} } diff --git a/recipes/sudo b/recipes/sudo index e3e5d6b4..28937d6f 100644 --- a/recipes/sudo +++ b/recipes/sudo @@ -3,7 +3,7 @@ revision=1 from_source=sudo imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc libxcrypt" +deps="base libxcrypt" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --with-secure-path --with-env-editor --with-passprompt="[sudo] password for %p: " --disable-nls diff --git a/recipes/tar b/recipes/tar index ecd51305..db824ffc 100644 --- a/recipes/tar +++ b/recipes/tar @@ -2,13 +2,13 @@ name=tar revision=1 from_source=tar imagedeps="base-devel" -hostdeps="xgcc xbinutils" -deps="mlibc bzip2 zlib gzip" +hostdeps="xgcc xbinutils pkgconfig libtool" +deps="base bzip2 zlib gzip" build() { cp -rpf ${source_dir}/* . ./configure --host=x86_64-astral --prefix=${prefix} - make -j ${parallelism} + make -j ${parallelism} LDFLAGS="-lintl -liconv" } package() { diff --git a/recipes/twm b/recipes/twm index 52b78578..3bd3d193 100644 --- a/recipes/twm +++ b/recipes/twm @@ -3,7 +3,7 @@ revision=1 from_source=twm imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorg-server xsetroot" +deps="base xorg-server xsetroot" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/tyrquake b/recipes/tyrquake index 60ad732f..4063d517 100644 --- a/recipes/tyrquake +++ b/recipes/tyrquake @@ -3,7 +3,7 @@ revision=1 from_source=tyrquake imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc libx11 libxext libxxf86vm sdl2" +deps="base libx11 libxext libxxf86vm sdl2" build() { cp -rp ${source_dir}/* . diff --git a/recipes/util-macros b/recipes/util-macros index 2302f765..da1c0beb 100644 --- a/recipes/util-macros +++ b/recipes/util-macros @@ -3,7 +3,7 @@ revision=1 from_source=util-macros imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/vim b/recipes/vim index 946695cd..7839397c 100644 --- a/recipes/vim +++ b/recipes/vim @@ -3,7 +3,7 @@ revision=1 from_source=vim imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="ncurses mlibc" +deps="ncurses base" build() { cp -rp ${source_dir}/* . diff --git a/recipes/wget b/recipes/wget index 6f1cf706..d1dbdc43 100644 --- a/recipes/wget +++ b/recipes/wget @@ -3,7 +3,7 @@ revision=1 from_source=wget imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc zlib pcre2 openssl" +deps="base zlib pcre2 openssl" build() { cp -rpv ${source_dir}/* . diff --git a/recipes/xauth b/recipes/xauth index 9952ee20..d62270cc 100644 --- a/recipes/xauth +++ b/recipes/xauth @@ -3,7 +3,7 @@ revision=1 from_source=xauth imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig xorgproto" -deps="mlibc libx11 libxaw libxext libxmu" +deps="base libx11 libxaw libxext libxmu" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xbitmaps b/recipes/xbitmaps index 19c654ae..c4a850f7 100644 --- a/recipes/xbitmaps +++ b/recipes/xbitmaps @@ -3,7 +3,7 @@ revision=1 from_source=xbitmaps imagedeps="meson base-devel" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xcb-proto b/recipes/xcb-proto index 9c695369..98b4e254 100644 --- a/recipes/xcb-proto +++ b/recipes/xcb-proto @@ -3,7 +3,7 @@ revision=1 from_source=xcb-proto imagedeps="base-devel python3" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { PYTHON=python3 ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} diff --git a/recipes/xclock b/recipes/xclock index 612a2ea9..46435a42 100644 --- a/recipes/xclock +++ b/recipes/xclock @@ -3,7 +3,7 @@ revision=1 from_source=xclock imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorg-server libxmu libxaw libxft" +deps="base xorg-server libxmu libxaw libxft" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xedit b/recipes/xedit index a0517d06..dc2c3271 100644 --- a/recipes/xedit +++ b/recipes/xedit @@ -3,7 +3,7 @@ revision=1 from_source=xedit imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 xorgproto libxt libxaw libxmu" +deps="base libx11 xorgproto libxt libxaw libxmu" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xev b/recipes/xev index 90109855..dde8c99f 100644 --- a/recipes/xev +++ b/recipes/xev @@ -3,7 +3,7 @@ revision=1 from_source=xev imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11 xorgproto libxrandr" +deps="base libx11 xorgproto libxrandr" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xeyes b/recipes/xeyes index 6da14cb1..c88292cc 100644 --- a/recipes/xeyes +++ b/recipes/xeyes @@ -3,7 +3,7 @@ revision=1 from_source=xeyes imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorg-server libxt libxmu libxext libxi libxrender" +deps="base xorg-server libxt libxmu libxext libxi libxrender" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xf86-input-keyboard b/recipes/xf86-input-keyboard index 18397eb4..9f0ad6c5 100644 --- a/recipes/xf86-input-keyboard +++ b/recipes/xf86-input-keyboard @@ -3,7 +3,7 @@ revision=1 from_source=xf86-input-keyboard imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" -deps="mlibc xorg-server" +deps="base xorg-server" build() { SYSROOT=${sysroot_dir} ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-static diff --git a/recipes/xf86-input-mouse b/recipes/xf86-input-mouse index 17a505f7..942b86f3 100644 --- a/recipes/xf86-input-mouse +++ b/recipes/xf86-input-mouse @@ -3,7 +3,7 @@ revision=1 from_source=xf86-input-mouse imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" -deps="mlibc xorg-server" +deps="base xorg-server" build() { SYSROOT=${sysroot_dir} ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-static diff --git a/recipes/xf86-video-fbdev b/recipes/xf86-video-fbdev index c93f15d0..9767b614 100644 --- a/recipes/xf86-video-fbdev +++ b/recipes/xf86-video-fbdev @@ -3,7 +3,7 @@ revision=1 from_source=xf86-video-fbdev imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" -deps="mlibc xorg-server" +deps="base xorg-server" build() { SYSROOT=${sysroot_dir} ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-static --disable-pciaccess diff --git a/recipes/xfontalias b/recipes/xfontalias index 065a0687..d41035a2 100644 --- a/recipes/xfontalias +++ b/recipes/xfontalias @@ -3,7 +3,7 @@ revision=1 from_source=xfontalias imagedeps="gcc xorg-mkfontscale" hostdeps="xgcc xbinutils pkgconfig util-macros fontutil" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xfontmiscethipic b/recipes/xfontmiscethipic index 65a54c61..01451449 100644 --- a/recipes/xfontmiscethipic +++ b/recipes/xfontmiscethipic @@ -3,7 +3,7 @@ revision=1 from_source=xfontmiscethipic imagedeps="gcc xorg-mkfontscale" hostdeps="xgcc xbinutils pkgconfig util-macros fontutil" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xfontmiscmisc b/recipes/xfontmiscmisc index 7eab1c70..733c938f 100644 --- a/recipes/xfontmiscmisc +++ b/recipes/xfontmiscmisc @@ -3,7 +3,7 @@ revision=1 from_source=xfontmiscmisc imagedeps="gcc xorg-bdftopcf xorg-mkfontscale" hostdeps="xgcc xbinutils pkgconfig fontutil" -deps="mlibc fontutil" +deps="base fontutil" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --with-fontrootdir=${prefix}/share/fonts/X11 diff --git a/recipes/xkbcomp b/recipes/xkbcomp index e59559a8..bf6224c1 100644 --- a/recipes/xkbcomp +++ b/recipes/xkbcomp @@ -3,7 +3,7 @@ revision=1 from_source=xkbcomp imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" -deps="mlibc libxcb xcb-proto xkbfile" +deps="base libxcb xcb-proto xkbfile" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xkbfile b/recipes/xkbfile index 27badf09..5643a496 100644 --- a/recipes/xkbfile +++ b/recipes/xkbfile @@ -3,7 +3,7 @@ revision=1 from_source=xkbfile imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto libx11" +deps="base xorgproto libx11" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xkeyboardconfig b/recipes/xkeyboardconfig index 8a968a6c..fabc811e 100644 --- a/recipes/xkeyboardconfig +++ b/recipes/xkeyboardconfig @@ -3,7 +3,7 @@ revision=1 from_source=xkeyboardconfig imagedeps="gcc meson ninja" hostdeps="xgcc xbinutils pkgconfig automake autoconf util-macros libtool" -deps="mlibc" +deps="base" build() { meson --cross-file ${base_dir}/util/crossfile --prefix=${prefix} ${source_dir} diff --git a/recipes/xneko b/recipes/xneko index 4d70d75d..69e06248 100644 --- a/recipes/xneko +++ b/recipes/xneko @@ -3,7 +3,7 @@ revision=1 from_source=xneko imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libx11" +deps="base libx11" build() { x86_64-astral-gcc -o xneko ${source_dir}/xneko.c -lX11 -lm diff --git a/recipes/xorg-server b/recipes/xorg-server index 78dab161..e1825d57 100644 --- a/recipes/xorg-server +++ b/recipes/xorg-server @@ -3,7 +3,7 @@ revision=1 from_source=xorg-server imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig autoconf automake libtool pkgconfig util-macros xtrans fontutil" -deps="mlibc libxcvt pixman xorgproto xtrans xkbfile libxfont2 fontutil libgcrypt freetype xkeyboardconfig xkbcomp libxi libxrender libxcb libxext pixman libxdamage" +deps="base libxcvt pixman xorgproto xtrans xkbfile libxfont2 fontutil libgcrypt freetype xkeyboardconfig xkbcomp libxi libxrender libxcb libxext pixman libxdamage" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --disable-pciaccess --disable-libdrm --disable-glx --disable-int10-module --disable-glamor --disable-vgahw --disable-dri3 --disable-dri2 --disable-dri --disable-xephyr --disable-xwayland --disable-xnest --disable-dmx --with-fontrootdir=${prefix}/share/fonts/X11 diff --git a/recipes/xorgproto b/recipes/xorgproto index 38ec7310..622401d0 100644 --- a/recipes/xorgproto +++ b/recipes/xorgproto @@ -3,7 +3,7 @@ revision=1 from_source=xorgproto imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc" +deps="base" build() { meson --cross-file=${base_dir}/util/crossfile --prefix=${prefix} -Dlegacy=true ${source_dir} diff --git a/recipes/xrandr b/recipes/xrandr index 1973c450..72ddacb0 100644 --- a/recipes/xrandr +++ b/recipes/xrandr @@ -3,7 +3,7 @@ revision=1 from_source=xrandr imagedeps="gcc" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorgproto libx11 libxrandr" +deps="base xorgproto libx11 libxrandr" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xscreensaver b/recipes/xscreensaver index d66dc4be..effbc7b3 100644 --- a/recipes/xscreensaver +++ b/recipes/xscreensaver @@ -3,7 +3,7 @@ revision=1 from_source=xscreensaver imagedeps="meson ninja base-devel intltool" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc libxcrypt libx11 libxt libjpeg-turbo libpng libxft libxext libxi mesa glu" +deps="base libxcrypt libx11 libxt libjpeg-turbo libpng libxft libxext libxi mesa glu" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral --with-glx diff --git a/recipes/xsetroot b/recipes/xsetroot index 2d8a7ab3..a37ee2bb 100644 --- a/recipes/xsetroot +++ b/recipes/xsetroot @@ -3,7 +3,7 @@ revision=1 from_source=xsetroot imagedeps="meson ninja base-devel" hostdeps="xgcc xbinutils pkgconfig" -deps="mlibc xorg-server libxmu xbitmaps libxcursor" +deps="base xorg-server libxmu xbitmaps libxcursor" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/xterm b/recipes/xterm index 6a0395ba..04693c9a 100644 --- a/recipes/xterm +++ b/recipes/xterm @@ -3,7 +3,7 @@ revision=1 from_source=xterm imagedeps="base-devel" hostdeps="xgcc xbinutils pkgconfig libtool" -deps="mlibc libx11 libxaw ncurses" +deps="base libx11 libxaw ncurses" build() { ${source_dir}/configure --host=x86_64-astral --prefix=${prefix} --disable-tcap-fkeys --disable-tcap-query --enable-256-color diff --git a/recipes/xtrans b/recipes/xtrans index 81d5079a..ec064da8 100644 --- a/recipes/xtrans +++ b/recipes/xtrans @@ -3,7 +3,7 @@ revision=1 from_source=xtrans imagedeps="meson ninja gcc" hostdeps="xgcc xbinutils pkgconfig util-macros" -deps="mlibc" +deps="base" build() { ${source_dir}/configure --prefix=${prefix} --host=x86_64-astral diff --git a/recipes/zlib b/recipes/zlib index e18742b5..4c0b9fd8 100644 --- a/recipes/zlib +++ b/recipes/zlib @@ -3,7 +3,7 @@ revision=1 from_source=zlib imagedeps="base-devel" hostdeps="xgcc xbinutils" -deps="mlibc" +deps="base" build() { CHOST=x86_64-astral prefix=${prefix} ${source_dir}/configure diff --git a/source-recipes/libintl b/source-recipes/libiconv similarity index 100% rename from source-recipes/libintl rename to source-recipes/libiconv diff --git a/tools/init/main.c b/tools/init/main.c index aa1cd595..50a81250 100644 --- a/tools/init/main.c +++ b/tools/init/main.c @@ -241,8 +241,8 @@ static void dostartwm(void) { if (pid == 0) { unblocksignals(); - execl("/usr/bin/startwm", NULL); - perror("init: exec /usr/bin/startwm failed"); + execl("/usr/libexec/astral/startwm", NULL); + perror("init: exec /usr/libexec/astral/startwm failed"); exit(EXIT_FAILURE); }