From 6c320e98ba7f35bdfc15384b93fd05b6715fa6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 16 Dec 2017 17:52:17 +0100 Subject: [PATCH] ruby: retry to build for *-musl 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. --- common/xbps-src/shutils/chroot.sh | 6 +++++- srcpkgs/ruby/template | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 11c562d22a4..084627916d1 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -82,7 +82,11 @@ chroot_prepare() { fi # 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 [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 44ecc47d84f..a0737efdc5c 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -19,12 +19,6 @@ hostmakedepends="pkg-config bison groff doxygen graphviz" makedepends="zlib-devel readline-devel libffi-devel libressl-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 hostmakedepends+=" ruby" fi