diff options
| -rwxr-xr-x | devbuild.sh | 4 | ||||
| -rw-r--r-- | groups/120.native_runtime.group | 5 | ||||
| -rw-r--r-- | groups/800.minipix.group | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/devbuild.sh b/devbuild.sh index 702639df..fc9cc843 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -5,8 +5,8 @@ set -eu DEV_PACKAGES=\ musl_no_complex_host,musl_full_host,musl_full,\ psxtypes,pemagine,dalist,ldso,ntcon,ntapi,\ -psxscl,psxscl_strace,ntctty,ntux,ptycon,u16ports,\ -ntctty_minipix,ntux_minipix,ptycon_minipix +psxscl,psxscl_strace,ntctty,ntux,ptycon,toksvc,u16ports,\ +ntctty_minipix,ntux_minipix,ptycon_minipix,toksvc_minipix mb_project_dir=$(cd "$(dirname $0)" ; pwd) cd "$mb_project_dir" diff --git a/groups/120.native_runtime.group b/groups/120.native_runtime.group index fed950d5..899bdbf8 100644 --- a/groups/120.native_runtime.group +++ b/groups/120.native_runtime.group @@ -7,7 +7,7 @@ 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_GROUP_DEPENDS="host_deps host_deps_rpm host_toolchain host_tools native_toolchain native_tools"; NATIVE_RUNTIME_PACKAGES=" -dalist ldso ntapi ntcon ntctty ntux pemagine psxscl psxscl_strace psxtypes ptycon sltdl u16ports"; +dalist ldso ntapi ntcon ntctty ntux pemagine psxscl psxscl_strace psxtypes ptycon toksvc sltdl u16ports"; NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_DALIST_DEPENDS:="ldso psxtypes"}; : ${PKG_DALIST_URLS_GIT:=dalist=${DEFAULT_GITROOT}/dalist}; @@ -52,6 +52,9 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PTYCON_URLS_GIT:=ptycon=${DEFAULT_GITROOT}/ptycon}; : ${PKG_PTYCON_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_PTYCON_INSTALL_TARGET_EXTRA:="install-app install-lib"}; +: ${PKG_TOKSVC_DEPENDS:="dalist ldso ntapi ntcon psxscl"}; +: ${PKG_TOKSVC_URLS_GIT:=toksvc=${DEFAULT_GITROOT}/toksvc}; +: ${PKG_TOKSVC_CFLAGS_CONFIGURE_EXTRA:=-O0}; : ${PKG_SLTDL_DEPENDS:="ldso"}; : ${PKG_SLTDL_URLS_GIT:=sltdl=${DEFAULT_GITROOT}/sltdl}; : ${PKG_SLTDL_CONFIGURE_ARGS_EXTRA:=--as-ltdl-drop-in-replacement}; diff --git a/groups/800.minipix.group b/groups/800.minipix.group index c1051b01..b7f94877 100644 --- a/groups/800.minipix.group +++ b/groups/800.minipix.group @@ -15,7 +15,7 @@ diffutils_minipix dropbear_minipix findutils_minipix gawk_minipix gdb_minipix grep_minipix gzip_minipix infounzip_minipix infozip_minipix less_minipix libz_minipix nano_minipix patch_minipix python2_minipix sed_minipix tar_minipix tpax_minipix vim_minipix wget_minipix which_minipix xz_minipix -mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix"; +mintty_minipix ntctty_minipix ntux_minipix perk_minipix ptycon_minipix toksvc_minipix"; MINIPIX_PKG_CONFIG_LIBDIR="${PREFIX_NATIVE}/lib/pkgconfig"; MINIPIX_PKGLIST_DISABLE=1; MINIPIX_PREFIX="${PREFIX}/minipix_dist"; @@ -79,6 +79,9 @@ MINIPIX_RPM_DISABLE=1; : ${PKG_PTYCON_MINIPIX_INHERIT_FROM:=ptycon}; : ${PKG_PTYCON_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; : ${PKG_PTYCON_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; +: ${PKG_TOKSVC_MINIPIX_INHERIT_FROM:=toksvc}; +: ${PKG_TOKSVC_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${DEFAULT_TARGET}"}; +: ${PKG_TOKSVC_MINIPIX_ENV_VARS_EXTRA:="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"}; : ${PKG_TPAX_MINIPIX_INHERIT_FROM:=tpax}; : ${PKG_TPAX_MINIPIX_INHERIT_CONFIGURE_ARGS:="--prefix --strict --host=${DEFAULT_TARGET}"}; |