1 files changed, 22 insertions, 9 deletions
diff --git a/vars/build.vars b/vars/build.vars
index 9d578460..fc423521 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -90,7 +90,7 @@ INVARIANTS_PACKAGES="chainport";
 HOST_TOOLCHAIN_BUILD_TYPE="host";
 HOST_TOOLCHAIN_CFLAGS_CONFIGURE="${HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}";
 HOST_TOOLCHAIN_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
-HOST_TOOLCHAIN_PACKAGES="slibtool_host perk_host binutils_host binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full file_host install_strip_host mdso_host pkgconf_host";
+HOST_TOOLCHAIN_PACKAGES="slibtool_host perk_host mdso_host binutils_host binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full file_host install_strip_host psxtypes_host ldso_host pkgconf_host";
 HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=};
@@ -102,6 +102,12 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_PERK_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"};
 : ${PKG_PERK_HOST_PREFIX:=${PREFIX}};
 : ${PKG_PERK_HOST_SUBDIR:=perk};
+: ${PKG_MDSO_HOST_URLS_GIT:="mdso=${GITROOT}/mdso"};
+: ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix=/usr"};
+: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso bin/mdso=${TARGET}/bin/mdso"};
+: ${PKG_MDSO_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"};
+: ${PKG_MDSO_HOST_PREFIX:=${PREFIX}};
+: ${PKG_MDSO_HOST_SUBDIR:=mdso};
 : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_VERSION}.tar.bz2};
@@ -130,12 +136,18 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_FILE_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX}"};
 : ${PKG_INSTALL_STRIP_HOST_BUILD_STEPS:="setup_env:always install:main"};
 : ${PKG_INSTALL_STRIP_HOST_URL:=none};
-: ${PKG_MDSO_HOST_URLS_GIT:="mdso=${GITROOT}/mdso"};
-: ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix=/usr"};
-: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso"};
-: ${PKG_MDSO_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX}"};
-: ${PKG_MDSO_HOST_PREFIX:=${PREFIX}};
-: ${PKG_MDSO_HOST_SUBDIR:=mdso};
+: ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${GITROOT}/psxtypes};
+: ${PKG_PSXTYPES_HOST_BUILD_DIR:=psxtypes};
+: ${PKG_PSXTYPES_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_CROSS}"};
+: ${PKG_PSXTYPES_HOST_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_CROSS}"};
+: ${PKG_PSXTYPES_HOST_SUBDIR:=psxtypes};
+: ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${GITROOT}/pemagine};
+: ${PKG_LDSO_HOST_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO -I${PREFIX_CROSS}/include"};
+: ${PKG_LDSO_HOST_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET} --disable-shared"};
+: ${PKG_LDSO_HOST_INSTALL_FILES:="@../${TARGET}/lib/libldso.a=${PREFIX}/lib/libldso.a"};
+: ${PKG_LDSO_HOST_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a};
+: ${PKG_LDSO_HOST_MAKEFLAGS_INSTALL_EXTRA:="DESTDIR=${PREFIX_CROSS} STATIC_LIB_NAME=libldso.a"};
+: ${PKG_LDSO_HOST_SUBDIR:=pemagine};
 : ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
 : ${PKG_PKGCONF_HOST_VERSION:=0.9.12};
 : ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2};
@@ -200,7 +212,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GCC_STAGE1_NATIVE_X86_64_W64_MINGW32_TARGET:=x86_64-w64-mingw32};
 : ${PKG_MDSO_URLS_GIT:="mdso=${GITROOT}/mdso"};
 : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix=/usr --target=${TARGET}"};
-: ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso"};
+: ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${TARGET}-mdso @../../bin/mdso=${TARGET}/bin/mdso"};
 : ${PKG_MDSO_SUBDIR:=mdso};
 
 #
@@ -227,6 +239,7 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LDSO_URLS_GIT:=pemagine=${GITROOT}/pemagine};
 : ${PKG_LDSO_CFLAGS_CONFIGURE_EXTRA:="-O0 -DPE_LDSO"};
 : ${PKG_LDSO_CONFIGURE_ARGS_EXTRA:=--disable-shared};
+: ${PKG_LDSO_INSTALL_FILES:="@libldso.a=${TARGET}/lib/libldso.a"};
 : ${PKG_LDSO_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_LDSO_MAKEFLAGS_INSTALL_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_LDSO_SUBDIR:=pemagine};
@@ -923,7 +936,7 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PYTHON3_VERSION:=3.5.1};
 : ${PKG_PYTHON3_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz};
 : ${PKG_PYTHON3_CONFIGURE_ARGS:="--build=x86_64 -C --enable-ipv6 --enable-shared --host=${TARGET} --prefix=${PREFIX_NATIVE} --without-ensurepip"};
-: ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${TARGET}-gcc -shared -mout-implib --sysroot=${PREFIX_NATIVE}:CC=${TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:CPPFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib"}:
+: ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${TARGET}-gcc -shared -mout-dsolib --sysroot=${PREFIX_NATIVE}:CC=${TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:CPPFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib"}:
 : ${PKG_PYTHON3_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
 : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}};
 : ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233};