Skip to content

Commit

Permalink
Fix cross compilation on Debian trixie container.
Browse files Browse the repository at this point in the history
New TCL uses Linux path instead of multiple lines.

Signed-off-by: Erez Geva <[email protected]>
  • Loading branch information
erezgeva committed Oct 18, 2024
1 parent 9a797b7 commit 12a1c60
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
3 changes: 2 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
5 changes: 4 additions & 1 deletion debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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;\
Expand Down

0 comments on commit 12a1c60

Please sign in to comment.