jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: set LC_COLLATE=C in environment as suggested by @chneukirchen.

Browse source 
This is enough to let ca-certificates build again.

Close #2513
This commit is contained in:
Juan RP 2015-09-15 08:15:13 +02:00
parent 5ced2dd2c9
commit a9b66c178a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/xbps-src/shutils/chroot.sh
View file

@ -33,7 +33,7 @@ XBPS_SRC_VERSION="$XBPS_SRC_VERSION"
PATH=/void-packages:/usr/bin:/usr/sbin PATH=/void-packages:/usr/bin:/usr/sbin
exec env -i SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \ exec env -i SHELL=/bin/sh PATH="\$PATH" DISTCC_HOSTS="\$XBPS_DISTCC_HOSTS" DISTCC_DIR="/host/distcc" @@XARCH@@ \
CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_ALL=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \ CCACHE_DIR="/host/ccache" IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 TERM=linux HOME="/tmp" \
PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h PS1="[\u@$XBPS_MASTERDIR \W]$ " /bin/bash +h
_EOF _EOF
if [ -n "$XBPS_ARCH" ]; then if [ -n "$XBPS_ARCH" ]; then
@ -198,7 +198,7 @@ chroot_handler() {
action="$arg $action" action="$arg $action"
env -i PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \ env -i PATH="/usr/bin:/usr/sbin:$PATH" SHELL=/bin/sh \
HOME=/tmp IN_CHROOT=1 LC_ALL=C LANG=en_US.UTF-8 \ HOME=/tmp IN_CHROOT=1 LC_COLLATE=C LANG=en_US.UTF-8 \
$XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \ $XBPS_COMMONDIR/chroot-style/${XBPS_CHROOT_CMD:=uunshare}.sh \
$XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \ $XBPS_MASTERDIR $XBPS_DISTDIR "$XBPS_HOSTDIR" "$XBPS_CHROOT_CMD_ARGS" \
/void-packages/xbps-src $action $pkg /void-packages/xbps-src $action $pkg