commit 34b7e73d6e27adb078aa22ffd56958ec22fc83f5 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Sep 22 22:29:54 2019 +1000 libreoffice: improve ccache useage diff --git a/libreoffice/.signature b/libreoffice/.signature index 46c9a409..647334fc 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36E9tcnDnOEfR8VmTFDZTm03lqw0XRck8up9cgfCF2M0/WrXZZ8f89EMMPVYNgk4xIilriiIWJEw3TTqKjLuTgE= -SHA256 (Pkgfile) = 8e3fe7ddf17f37d4959342b274d54f1c33bbeba362d4f7a4b8d9e9685dcb8086 +RWSagIOpLGJF32dkfThHvYBgCrMpdsB3YtZ1xZqtV7uknZaS7Z4zSYBAD0sJoF1RXNSnkLEGHJgGsud0/N3zeYJjpXnOz0RkUw4= +SHA256 (Pkgfile) = 26e7d7ec6d2cd01e8fa3c371f9f7e67b021289a698f3bd3c3e9be504b34be78a SHA256 (.footprint) = 2e6bbd97b7bef2d1d5254ce95990280f95ad03849b3ea754fbab32ad9ff4a666 SHA256 (libreoffice-6.3.2.2.tar.xz) = 407da27b18f10e8beda6a9c7137273098ddfd59503e502d99e239ff7fb07bd75 SHA256 (libreoffice-dictionaries-6.3.2.2.tar.xz) = b28e5fd2a3dc05eb871ba9a058bfaa6d92fab4d427cfca95f420a56f09ddd378 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index a4172e2b..75703b98 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -45,7 +45,8 @@ build() { -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # determine configure options based on installed packages on the system - [[ -e /usr/lib/ccache ]] && PKGMK_LIBREOFFICE+="" || PKGMK_LIBREOFFICE+=" --disable-ccache" + [[ -e /usr/lib/ccache ]] && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')" + [[ -e /usr/lib/ccache ]] && PKGMK_LIBREOFFICE+=" --enable-ccache" || PKGMK_LIBREOFFICE+=" --disable-ccache" [[ -e /usr/lib/cups ]] && PKGMK_LIBREOFFICE+=" --enable-cups" || PKGMK_LIBREOFFICE+=" --disable-cups" [[ -e /usr/lib/pkgconfig/gstreamer-plugins-base-1.0.pc ]] && PKGMK_LIBREOFFICE+=" --enable-gstreamer-1-0" || PKGMK_LIBREOFFICE+=" --disable-gstreamer-1-0" [[ -e /usr/lib/pkgconfig/Qt5Core.pc ]] && PKGMK_LIBREOFFICE+=" --enable-qt5" || PKGMK_LIBREOFFICE+=" --disable-qt5"