From 4fca29cc9bf692e9a304d2e25e5f27e0c1c3ec0e Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: May 23 2018 16:27:57 +0000 Subject: vars/build.vars:{native_runtime,minipix}: adds ntux{,_minipix} (via midipix.) --- diff --git a/vars/build.vars b/vars/build.vars index 111ea6b..b04446a 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -278,7 +278,7 @@ NATIVE_RUNTIME_BUILD_TYPE="native"; NATIVE_RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME}"; NATIVE_RUNTIME_CONFIGURE_ARGS="--prefix= --strict --host=${DEFAULT_TARGET}"; NATIVE_RUNTIME_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"; -NATIVE_RUNTIME_PACKAGES="psxtypes pemagine dalist ldso ntcon ntapi psxscl psxscl_strace ntctty ptycon u16ports"; +NATIVE_RUNTIME_PACKAGES="psxtypes pemagine dalist ldso ntcon ntapi psxscl psxscl_strace ntctty ntux ptycon u16ports"; NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes}; : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"}; @@ -307,6 +307,8 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PSXSCL_STRACE_INSTALL_FILES:="/=lib/psxscl_strace ../obj/lib/libpsxscl.so=lib/psxscl_strace/"}; : ${PKG_NTCTTY_URLS_GIT:=ntctty=${DEFAULT_GITROOT_HEAD}/ntctty}; : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0}; +: ${PKG_NTUX_URLS_GIT:=ntux=${DEFAULT_GITROOT}/ntux}; +: ${PKG_NTUX_CFLAGS_CONFIGURE_EXTRA:="-O0 -DNTUX_STANDALONE"}; : ${PKG_PTYCON_URLS_GIT:=ptycon=${DEFAULT_GITROOT_HEAD}/ptycon}; : ${PKG_PTYCON_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_PTYCON_INSTALL_TARGET_EXTRA:="install-app install-lib"}; @@ -1269,15 +1271,15 @@ NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python"; # MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; -MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs"; MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs"; +MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs"; MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; MINIPIX_PACKAGES=" bash_minipix bzip2_minipix coreutils_minipix dash_minipix diffutils_minipix findutils_minipix gawk_minipix grep_minipix gzip_minipix less_minipix nano_minipix patch_minipix sed_minipix tar_minipix vim_minipix wget_minipix which_minipix xz_minipix -mintty_minipix ntctty_minipix perk_minipix ptycon_minipix"; +mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix"; MINIPIX_PARALLELISE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; @@ -1320,6 +1322,10 @@ MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_NTCTTY_MINIPIX_INHERIT_FROM:=ntctty}; : ${PKG_NTCTTY_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; : ${PKG_NTCTTY_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; +: ${PKG_NTUX_MINIPIX_INHERIT_FROM:=ntux}; +: ${PKG_NTUX_MINIPIX_CONFIGURE_ARGS="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"}; +: ${PKG_NTUX_MINIPIX_LDFLAGS_BUILD:="--sysroot=${PREFIX_NATIVE}"}; +: ${PKG_NTUX_MINIPIX_LDFLAGS_CONFIGURE:="--sysroot=${PREFIX_NATIVE}"}; : ${PKG_PERK_MINIPIX_INHERIT_FROM:=perk}; : ${PKG_PTYCON_MINIPIX_INHERIT_FROM:=ptycon}; : ${PKG_PTYCON_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"};