diff --git a/jinx-config b/jinx-config index 1774726a0..b7bd8c0a1 100644 --- a/jinx-config +++ b/jinx-config @@ -3,11 +3,11 @@ JINX_MAJOR_VER=0.2 export CFLAGS="-O2 -pipe -fcf-protection" export CXXFLAGS="$CFLAGS" -OS_TRIPLET=x86_64-ironclad +OS_TRIPLET=x86_64-vinix -autotools_recursive_regen() { - for f in $(find . -name configure.ac); do - echo "* autotools regen in '$(dirname $f)'..." - ( cd "$(dirname "$f")" && libtoolize -cfvi && autoreconf -fvi "$@" ) - done +#autotools_recursive_regen() { +# for f in $(find . -name configure.ac); do +# echo "* autotools regen in '$(dirname $f)'..." +# ( cd "$(dirname "$f")" && libtoolize -cfvi && autoreconf -fvi "$@" ) +# done } diff --git a/recipes/bzip2 b/recipes/bzip2 index b7d6a020a..861c34b34 100644 --- a/recipes/bzip2 +++ b/recipes/bzip2 @@ -8,16 +8,16 @@ build() { cp -r ${source_dir}/. . sed -i 's/all: libbz2.a bzip2 bzip2recover test/all: libbz2.a bzip2 bzip2recover/g' Makefile - make CC=x86_64-vinix-gcc CFLAGS=-fPIC -f Makefile-libbz2_so + make CC=${OS_TRIPLET}-gcc CFLAGS=-fPIC -f Makefile-libbz2_so make clean - make CC=x86_64-vinix-gcc AR=x86_64-vinix-ar CFLAGS=-fPIC -j${parallelism} + make CC=${OS_TRIPLET}-gcc AR=${OS_TRIPLET}-ar CFLAGS=-fPIC -j${parallelism} } package() { mkdir -p "${dest_dir}${prefix}/bin" "${dest_dir}${prefix}/lib" "${dest_dir}${prefix}/lib/pkgconfig" "${dest_dir}${prefix}/include" - command install -s --strip-program=x86_64-vinix-strip bzip2-shared "${dest_dir}${prefix}/bin/bzip2" - command install -s --strip-program=x86_64-vinix-strip bzip2recover "${dest_dir}${prefix}/bin/" - command install -s --strip-program=x86_64-vinix-strip libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/" + command install -s --strip-program=${OS_TRIPLET}-strip bzip2-shared "${dest_dir}${prefix}/bin/bzip2" + command install -s --strip-program=${OS_TRIPLET}-strip bzip2recover "${dest_dir}${prefix}/bin/" + command install -s --strip-program=${OS_TRIPLET}-strip libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/" command install -m 644 bzlib.h "${dest_dir}${prefix}/include/" ln -sf libbz2.so.1.0.8 "${dest_dir}${prefix}/lib/libbz2.so.1.0" ln -sf libbz2.so.1.0 "${dest_dir}${prefix}/lib/libbz2.so.1" diff --git a/recipes/fontconfig b/recipes/fontconfig index 32b1f23d7..f6028d2b9 100644 --- a/recipes/fontconfig +++ b/recipes/fontconfig @@ -7,7 +7,7 @@ imagedeps="python gperf" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/freetype b/recipes/freetype index e9bec36bb..5adb8c34e 100644 --- a/recipes/freetype +++ b/recipes/freetype @@ -7,7 +7,7 @@ imagedeps="gcc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/gcc b/recipes/gcc index 1cea3e304..95787a946 100644 --- a/recipes/gcc +++ b/recipes/gcc @@ -9,9 +9,9 @@ cbuild() { CXXFLAGS_FOR_TARGET="$CFLAGS" \ CFLAGS_FOR_TARGET="$CFLAGS" \ ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ - --target=x86_64-vinix \ + --target=${OS_TRIPLET} \ --with-sysroot=/ \ --with-build-sysroot=${sysroot_dir} \ --enable-languages=c,c++ \ @@ -29,8 +29,8 @@ package() { DESTDIR="${dest_dir}" make install-strip-gcc DESTDIR="${dest_dir}" make install-strip-target-libgcc - rm "${dest_dir}${prefix}"/lib/gcc/x86_64-vinix/12.2.0/crti.o - rm "${dest_dir}${prefix}"/lib/gcc/x86_64-vinix/12.2.0/crtn.o + rm "${dest_dir}${prefix}"/lib/gcc/${OS_TRIPLET}/12.2.0/crti.o + rm "${dest_dir}${prefix}"/lib/gcc/${OS_TRIPLET}/12.2.0/crtn.o DESTDIR="${dest_dir}" make install-strip-target-libstdc++-v3 diff --git a/recipes/grep b/recipes/grep index 064c1e1b2..8d0382163 100644 --- a/recipes/grep +++ b/recipes/grep @@ -10,7 +10,7 @@ build() { libtoolize -cfvi && autoreconf -fvi ./configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-nls diff --git a/recipes/less b/recipes/less index 4514668b6..ec872b93c 100644 --- a/recipes/less +++ b/recipes/less @@ -6,7 +6,7 @@ deps="mlibc ncurses" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix="${prefix}" \ --sysconfdir=/etc diff --git a/recipes/libexpat b/recipes/libexpat index 0f86781f8..adb6dfb40 100644 --- a/recipes/libexpat +++ b/recipes/libexpat @@ -6,7 +6,7 @@ deps="mlibc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static \ --without-xmlwf diff --git a/recipes/libffi b/recipes/libffi index 9787f3bad..1a433fa95 100644 --- a/recipes/libffi +++ b/recipes/libffi @@ -6,7 +6,7 @@ deps="mlibc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static diff --git a/recipes/libfontenc b/recipes/libfontenc index dbff7ebb9..7fc9e445c 100644 --- a/recipes/libfontenc +++ b/recipes/libfontenc @@ -6,7 +6,7 @@ deps="mlibc xorg-proto zlib" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libice b/recipes/libice index 605b3ee71..f6d068832 100644 --- a/recipes/libice +++ b/recipes/libice @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libiconv b/recipes/libiconv index 11e8eadc7..e1b1de469 100644 --- a/recipes/libiconv +++ b/recipes/libiconv @@ -7,7 +7,7 @@ imagedeps="binutils" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static \ --enable-shared \ diff --git a/recipes/libintl b/recipes/libintl index 32944117f..4699211a0 100644 --- a/recipes/libintl +++ b/recipes/libintl @@ -6,7 +6,7 @@ deps="mlibc-base libiconv" configure() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --without-emacs \ --without-lispdir \ diff --git a/recipes/libpng b/recipes/libpng index 6e8ec2695..2debc57d5 100644 --- a/recipes/libpng +++ b/recipes/libpng @@ -6,7 +6,7 @@ deps="mlibc zlib" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static diff --git a/recipes/libsm b/recipes/libsm index c56d1bfcf..5109a29f0 100644 --- a/recipes/libsm +++ b/recipes/libsm @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libice" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libx11 b/recipes/libx11 index 73ae44025..6e1fdc347 100644 --- a/recipes/libx11 +++ b/recipes/libx11 @@ -7,7 +7,7 @@ imagedeps="gcc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxau b/recipes/libxau index 72573bf9d..d74fed3e7 100644 --- a/recipes/libxau +++ b/recipes/libxau @@ -6,7 +6,7 @@ deps="mlibc xorg-proto" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxaw b/recipes/libxaw index aeb583399..33ebe047f 100644 --- a/recipes/libxaw +++ b/recipes/libxaw @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxext libxt libxmu libxpm" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxcb b/recipes/libxcb index bbbe31299..d01f51123 100644 --- a/recipes/libxcb +++ b/recipes/libxcb @@ -7,7 +7,7 @@ imagedeps="python" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxcrypt b/recipes/libxcrypt index b35dfac22..48476725f 100644 --- a/recipes/libxcrypt +++ b/recipes/libxcrypt @@ -6,7 +6,7 @@ deps="mlibc-base" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --enable-obsolete-api=yes \ --disable-xcrypt-compat-files \ diff --git a/recipes/libxcursor b/recipes/libxcursor index 3a17800a8..1fc745a54 100644 --- a/recipes/libxcursor +++ b/recipes/libxcursor @@ -6,7 +6,7 @@ deps="mlibc libxrender libxfixes libx11" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxdamage b/recipes/libxdamage index 78117dae9..91ed44ca5 100644 --- a/recipes/libxdamage +++ b/recipes/libxdamage @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxfixes" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxdmcp b/recipes/libxdmcp index efd69a4be..b3c450bcc 100644 --- a/recipes/libxdmcp +++ b/recipes/libxdmcp @@ -6,7 +6,7 @@ deps="mlibc xorg-proto xorg-util-macros libxau" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxext b/recipes/libxext index a727e48cd..e9a7656b6 100644 --- a/recipes/libxext +++ b/recipes/libxext @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxfixes b/recipes/libxfixes index d0cc60f74..dbfd89f4e 100644 --- a/recipes/libxfixes +++ b/recipes/libxfixes @@ -5,7 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config" deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxfont2 b/recipes/libxfont2 index b2dc7cb98..648ee1936 100644 --- a/recipes/libxfont2 +++ b/recipes/libxfont2 @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans freetype fontconfig bzi configure() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxft b/recipes/libxft index d76dc73eb..1e9f5a9e6 100644 --- a/recipes/libxft +++ b/recipes/libxft @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxrender freetype fontconfig" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxi b/recipes/libxi index cf11f0073..fbf5b6fd7 100644 --- a/recipes/libxi +++ b/recipes/libxi @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxext libxfixes" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxkbfile b/recipes/libxkbfile index af935035a..afd6ab74b 100644 --- a/recipes/libxkbfile +++ b/recipes/libxkbfile @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxml b/recipes/libxml index ad84fb1dd..ee2a1d812 100644 --- a/recipes/libxml +++ b/recipes/libxml @@ -6,7 +6,7 @@ deps="mlibc zlib" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static \ --without-threads \ diff --git a/recipes/libxmu b/recipes/libxmu index 63dfeb265..b11fc57ec 100644 --- a/recipes/libxmu +++ b/recipes/libxmu @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxext libxt" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxpm b/recipes/libxpm index 28d2897fc..156f0e536 100644 --- a/recipes/libxpm +++ b/recipes/libxpm @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxext libxt" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxrandr b/recipes/libxrandr index 3cb774353..b8deecb2f 100644 --- a/recipes/libxrandr +++ b/recipes/libxrandr @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxrender libxext" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxrender b/recipes/libxrender index 33b5ece4c..3d5d41e6f 100644 --- a/recipes/libxrender +++ b/recipes/libxrender @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxshmfence b/recipes/libxshmfence index 17d5f67bd..76fd9bb83 100644 --- a/recipes/libxshmfence +++ b/recipes/libxshmfence @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxt b/recipes/libxt index d1f82dbd9..1f1c7e888 100644 --- a/recipes/libxt +++ b/recipes/libxt @@ -7,7 +7,7 @@ imagedeps="gcc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxtrans b/recipes/libxtrans index f4874d950..61c39937d 100644 --- a/recipes/libxtrans +++ b/recipes/libxtrans @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libxcb" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/libxv b/recipes/libxv index b3600bd23..cd09d9b92 100644 --- a/recipes/libxv +++ b/recipes/libxv @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxext libxfixes" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/libxxf86vm b/recipes/libxxf86vm index 5946f8b18..7a36da94d 100644 --- a/recipes/libxxf86vm +++ b/recipes/libxxf86vm @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxtrans libxext" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/llvm b/recipes/llvm index 94d47b63d..df3902bdc 100644 --- a/recipes/llvm +++ b/recipes/llvm @@ -15,8 +15,8 @@ build() { -DLLVM_ENABLE_RTTI=ON \ -DLLVM_TARGETS_TO_BUILD=X86 \ -DLLVM_TARGET_ARCH=x86_64 \ - -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-vinix \ - -DLLVM_HOST_TRIPLE=x86_64-vinix \ + -DLLVM_DEFAULT_TARGET_TRIPLE=OS_TRIPLET=${OS_TRIPLET} \ + -DLLVM_HOST_TRIPLE=OS_TRIPLET=${OS_TRIPLET} \ -DLLVM_ENABLE_TERMINFO=OFF \ -Wno-dev \ ${source_dir}/llvm diff --git a/recipes/mpc b/recipes/mpc index bb5c348f5..c624f3c0f 100644 --- a/recipes/mpc +++ b/recipes/mpc @@ -7,7 +7,7 @@ deps="mlibc gmp mpfr" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static diff --git a/recipes/mpfr b/recipes/mpfr index 5be98a2fb..d56df18de 100644 --- a/recipes/mpfr +++ b/recipes/mpfr @@ -10,7 +10,7 @@ build() { libtoolize -cfvi && autoreconf -fvi ./configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --enable-static=no \ --enable-shared=yes \ diff --git a/recipes/nano b/recipes/nano index e25a77fbe..2c57d3146 100644 --- a/recipes/nano +++ b/recipes/nano @@ -6,7 +6,7 @@ deps="mlibc ncurses libintl" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --disable-nls diff --git a/recipes/nasm b/recipes/nasm index 15cb19ba5..7cffe4ac7 100644 --- a/recipes/nasm +++ b/recipes/nasm @@ -9,7 +9,7 @@ build() { libtoolize -cfvi && autoreconf -fvi -I$(realpath ./autoconf) ./configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} make diff --git a/recipes/ncurses b/recipes/ncurses index 7682c3a6c..9f257d572 100644 --- a/recipes/ncurses +++ b/recipes/ncurses @@ -8,7 +8,7 @@ deps="mlibc" build() { cf_cv_func_nanosleep=yes \ "${source_dir}"/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix="${prefix}" \ --enable-pc-files \ --with-shared \ diff --git a/recipes/nettle b/recipes/nettle index 0d9f4ab39..ce10d86a2 100644 --- a/recipes/nettle +++ b/recipes/nettle @@ -7,7 +7,7 @@ imagedeps="gcc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-documentation \ --disable-static diff --git a/recipes/pcre b/recipes/pcre index 75511a801..34ba1a5c9 100644 --- a/recipes/pcre +++ b/recipes/pcre @@ -6,7 +6,7 @@ deps="mlibc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --enable-unicode-properties \ --enable-pcre8 \ diff --git a/recipes/pixman b/recipes/pixman index 3b0bf50dd..da2bb1282 100644 --- a/recipes/pixman +++ b/recipes/pixman @@ -6,7 +6,7 @@ deps="mlibc libpng" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static diff --git a/recipes/readline b/recipes/readline index cb4538401..457f97074 100644 --- a/recipes/readline +++ b/recipes/readline @@ -6,7 +6,7 @@ deps="mlibc ncurses" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static \ --enable-multibyte diff --git a/recipes/twm b/recipes/twm index 125b607e3..5f0a53180 100644 --- a/recipes/twm +++ b/recipes/twm @@ -6,7 +6,7 @@ deps="mlibc xorg-server xsetroot" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/xcb-proto b/recipes/xcb-proto index 1b2e49c13..250bb16fd 100644 --- a/recipes/xcb-proto +++ b/recipes/xcb-proto @@ -7,7 +7,7 @@ imagedeps="python" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/xclock b/recipes/xclock index 1e23244d9..269386c31 100644 --- a/recipes/xclock +++ b/recipes/xclock @@ -6,7 +6,7 @@ deps="mlibc libx11 libxmu libxaw libxrender libxft libxt libxkbfile" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xeyes b/recipes/xeyes index de973416f..b7d304d94 100644 --- a/recipes/xeyes +++ b/recipes/xeyes @@ -6,7 +6,7 @@ deps="mlibc libx11 libxmu libxaw libxrender libxft libxt libxi libxkbfile" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xf86-input-keyboard b/recipes/xf86-input-keyboard index dbaed53cf..e56aaa160 100644 --- a/recipes/xf86-input-keyboard +++ b/recipes/xf86-input-keyboard @@ -6,7 +6,7 @@ deps="mlibc xorg-server xorg-util-macros libx11" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xf86-input-mouse b/recipes/xf86-input-mouse index 17f38dd1d..0997bf2ac 100644 --- a/recipes/xf86-input-mouse +++ b/recipes/xf86-input-mouse @@ -6,7 +6,7 @@ deps="mlibc xorg-server xorg-util-macros libx11" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xf86-video-fbdev b/recipes/xf86-video-fbdev index b7c779729..1c3925a64 100644 --- a/recipes/xf86-video-fbdev +++ b/recipes/xf86-video-fbdev @@ -7,7 +7,7 @@ deps="mlibc xorg-server xorg-util-macros" build() { SYSROOT=${sysroot_dir} \ ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xkbcomp b/recipes/xkbcomp index b3a71276d..158a11e02 100644 --- a/recipes/xkbcomp +++ b/recipes/xkbcomp @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros libx11 libxkbfile" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/xkbutils b/recipes/xkbutils index b9b18993d..fe37596ff 100644 --- a/recipes/xkbutils +++ b/recipes/xkbutils @@ -6,7 +6,7 @@ deps="mlibc xorg-util-macros xorg-proto libx11 libxt libxaw" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/xkeyboard-config b/recipes/xkeyboard-config index 7330bb81a..3ad8af702 100644 --- a/recipes/xkeyboard-config +++ b/recipes/xkeyboard-config @@ -7,7 +7,7 @@ imagedeps="python" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xorg-font-util b/recipes/xorg-font-util index 2b3d40961..285a2e341 100644 --- a/recipes/xorg-font-util +++ b/recipes/xorg-font-util @@ -6,7 +6,7 @@ deps="mlibc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/xorg-proto b/recipes/xorg-proto index fbdaed83c..08ad6e371 100644 --- a/recipes/xorg-proto +++ b/recipes/xorg-proto @@ -6,7 +6,7 @@ deps="mlibc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/recipes/xorg-server b/recipes/xorg-server index c4d3177b3..033a5b6da 100644 --- a/recipes/xorg-server +++ b/recipes/xorg-server @@ -7,7 +7,7 @@ deps="mlibc xorg-util-macros xorg-proto xcb-proto libxtrans libxshmfence libx11 build() { CFLAGS="-Wno-error=array-bounds ${common_flags}" \ ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/recipes/xorg-util-macros b/recipes/xorg-util-macros index 47c6378de..07a065c58 100644 --- a/recipes/xorg-util-macros +++ b/recipes/xorg-util-macros @@ -6,7 +6,7 @@ deps="mlibc" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --sysconfdir=/etc diff --git a/recipes/xsetroot b/recipes/xsetroot index 8e56c6f41..9075032f7 100644 --- a/recipes/xsetroot +++ b/recipes/xsetroot @@ -5,7 +5,7 @@ hostdeps="gcc autoconf automake libtool pkg-config" deps="mlibc xorg-server libxmu xbitmaps libxcursor" build() { - ${source_dir}/configure --prefix=${prefix} --host=x86_64-vinix + ${source_dir}/configure --prefix=${prefix} --host=${OS_TRIPLET} make -j${parallelism} } diff --git a/recipes/xz-utils b/recipes/xz-utils index f92a507b0..b0d2dcf54 100644 --- a/recipes/xz-utils +++ b/recipes/xz-utils @@ -6,7 +6,7 @@ deps="mlibc zlib" build() { ${source_dir}/configure \ - --host=x86_64-vinix \ + --host=${OS_TRIPLET} \ --prefix=${prefix} \ --disable-static diff --git a/recipes/zlib b/recipes/zlib index a621acf22..ca5a83341 100644 --- a/recipes/zlib +++ b/recipes/zlib @@ -6,7 +6,7 @@ deps="mlibc" build() { prefix="${prefix}" \ - CHOST="x86_64-vinix" \ + CHOST="${OS_TRIPLET}" \ ${source_dir}/configure make -j${parallelism}