From 4497930aae83342434dd3dd609dc0bce34e8526a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Thu, 14 Jun 2018 12:03:29 +0200 Subject: [PATCH] boinc: nocross for now and fix glibc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The /etc/default/boinc-client is already installed for glibc but not for muslc. Check for existence of /etc/boinc-client.conf before trying to move it. Cross is currently broken because wxWidgets are not found. Signed-off-by: Jürgen Buchmüller --- srcpkgs/boinc/template | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 43a898e1d53..8e54f384c52 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -21,6 +21,7 @@ homepage="https://boinc.berkeley.edu/" distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz" checksum=0dd5bafb9e6eced2695c2f47a93d9165643d9132a1cf58fef0e733c4a70ea22c conflicts="boinc-nox>=0" +nocross="https://build.voidlinux.eu/builders/aarch64_builder/builds/10314/steps/shell_3/logs/stdio" CXXFLAGS="-Wno-redundant-decls" @@ -94,8 +95,11 @@ do_install() { cd ${wrksrc}/x11 make ${makejobs} DESTDIR="${DESTDIR}" install - vmkdir etc/default - mv "${DESTDIR}"/etc/boinc-client.conf "${DESTDIR}"/etc/default/boinc-client + if [ -f "${DESTDIR}/etc/boinc-client.conf" ]; then + vmkdir etc/default + mv "${DESTDIR}"/etc/boinc-client.conf \ + "${DESTDIR}"/etc/default/boinc-client + fi # Bash completion vinstall ${FILESDIR}/boinc.bash 644 usr/share/bash-completion/completions boinc @@ -104,7 +108,9 @@ do_install() { vmkdir usr/share/applications vinstall ${FILESDIR}/boinc.desktop 644 usr/share/applications for size in 16 24 32 64 128 256; do - vinstall ${FILESDIR}/boinc${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps boinc.png + vinstall ${FILESDIR}/boinc${size}.png 644 \ + usr/share/icons/hicolor/${size}x${size}/apps \ + boinc.png done vinstall ${FILESDIR}/boinc32.png 644 usr/share/pixmaps boinc.png vsv boinc @@ -126,8 +132,11 @@ boinc-nox_package() { cd ${wrksrc}/nox make ${makejobs} DESTDIR=${PKGDESTDIR} install - vmkdir etc/default - mv "${PKGDESTDIR}"/etc/boinc-client.conf "${PKGDESTDIR}"/etc/default/boinc-client + if [ -f "${PKGDESTDIR}/etc/boinc-client.conf" ]; then + vmkdir etc/default + mv "${PKGDESTDIR}"/etc/boinc-client.conf \ + "${PKGDESTDIR}"/etc/default/boinc-client + fi # no devel package - no includes, *.a and *.so rm -rf ${PKGDESTDIR}/usr/include