diff --git a/configure.ac b/configure.ac index c83393c6..371a7621 100644 --- a/configure.ac +++ b/configure.ac @@ -719,7 +719,8 @@ AS_VAR_IF([ptpm_tclpackage], ['no'], PTPM_VAR_EMPTY_IF([ptpm_tclver], [AS_VAR_COPY([ptpm_tclver], [TCL_VERSION])]) PTPM_VAR_SET_IF([TCL_PACKAGE_PATH], - [AS_VAR_COPY([ptpm_tcl_package_path], [TCL_PACKAGE_PATH]) + [PTPM_VAR_SED_COPY([ptpm_tcl_package_path], + [TCL_PACKAGE_PATH], ['s%:% %g']) PTPM_CROSS([ptpm_tcl_package_path]) dnl Try first folder under main libdir PTPM_FOR([d], [$ptpm_tcl_package_path], diff --git a/debian/Dockerfile b/debian/Dockerfile index bbf85f8a..995dfe1e 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -42,7 +42,10 @@ RUN if [ -f /etc/apt/sources.list.d/debian.sources ];then\ apt-get upgrade -y --no-install-recommends;\ sed -i 's/^enable_dl\s*=\s*Off/enable_dl = On/' /etc/php/*/cli/php.ini;\ useradd $USER -u $UID -m -G sudo;\ - sed -i '/%sudo/ s/ ALL$/ NOPASSWD:ALL/' /etc/sudoers + sed -i '/%sudo/ s/ ALL$/ NOPASSWD:ALL/' /etc/sudoers;\ + for a in $ARCHS; do list=`dpkg --get-selections | grep "linux-gnu:$a" |\ + sed "s/\s*install/ /;s/:$a/:$ARCH/" | tr -d $'\r\n'`; if [ -n "$list" ];\ + then apt-get install -y --no-install-recommends $list;fi;done ARG RTPI_VER RUN if test "$DIST" = "bookworm";then mkdir -p /tmp/1;cd /tmp/1;\ url=$REPO/pool/main/libr/librtpi;for a in $ARCH $ARCHS;\