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

ruby: retry to build for *-musl

Browse source 
chroot: copy UTC as localtime as fallback if /etc/localtime does not exist.
It looks as if ruby's rdoc was failing in a function using /etc/localtime.
This commit is contained in:
Jürgen Buchmüller 2017-12-16 17:52:17 +01:00
parent ed306bd3d6
commit 6c320e98ba
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,7 +82,11 @@ chroot_prepare() {
fi fi
# Create some required files. # Create some required files.
[ -f /etc/localtime ] && cp -f /etc/localtime $XBPS_MASTERDIR/etc if [ -f /etc/localtime ]; then
cp -f /etc/localtime $XBPS_MASTERDIR/etc
elif [ -f /usr/share/zoneinfo/UTC ]; then
cp -f /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
fi
for f in dev sys proc host boot; do for f in dev sys proc host boot; do
[ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f

6
srcpkgs/ruby/template
View file

@ -19,12 +19,6 @@ hostmakedepends="pkg-config bison groff doxygen graphviz"
makedepends="zlib-devel readline-devel libffi-devel libressl-devel makedepends="zlib-devel readline-devel libffi-devel libressl-devel
gdbm-devel libyaml-devel pango-devel" gdbm-devel libyaml-devel pango-devel"
case "$XBPS_TARGET_MACHINE" in
*-musl) # Broken on the builders but successfully built locally
broken="https://build.voidlinux.eu/builders/x86_64-musl_builder/builds/6630/steps/shell_3/logs/stdio"
;;
esac
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" ruby" hostmakedepends+=" ruby"
fi fi