From 8884b34cee87f65b892389c03d086aed6359e9fa Mon Sep 17 00:00:00 2001 From: John Date: Fri, 3 Jul 2020 11:52:57 +0200 Subject: [PATCH] bacula-common: fix cross patch --- srcpkgs/bacula-common/patches/fix-cross.patch | 4 ++-- srcpkgs/bacula-common/template | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/srcpkgs/bacula-common/patches/fix-cross.patch b/srcpkgs/bacula-common/patches/fix-cross.patch index 52c03d014f..f7e6f86170 100644 --- a/srcpkgs/bacula-common/patches/fix-cross.patch +++ b/srcpkgs/bacula-common/patches/fix-cross.patch @@ -19,8 +19,8 @@ MYSQL_LIBDIR=/usr/local/lib fi MYSQL_BINDIR=/usr/local/bin -+ elif test -f ${XBPS_CROSS_BASE}/usr/include/mysql.h; then -+ MYSQL_INCDIR=${XBPS_CROSS_BASE}/usr/include ++ elif test -f ${XBPS_CROSS_BASE}/usr/include/mysql/mysql.h; then ++ MYSQL_INCDIR=${XBPS_CROSS_BASE}/usr/include/mysql + if test -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.a \ + -o -f ${XBPS_CROSS_BASE}/usr/lib64/libmysqlclient_r.so; then + MYSQL_LIBDIR=${XBPS_CROSS_BASE}/usr/lib64 diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index 504583f406..02c9bb07fc 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -22,8 +22,6 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi -nocross="https://build.voidlinux.org/builders/armv6l_builder/builds/26660/steps/shell_3/logs/stdio" - post_install() { rm "${DESTDIR}/usr/bin/bacula" rm -rf "${DESTDIR}/usr/share/doc"