From 3356f49232b2bb3ebdffe4782678f07e38b47ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sat, 13 Jul 2024 10:25:08 +0100 Subject: [PATCH] engauge-digitizer: build without log4cpp on clangarm64 --- mingw-w64-engauge-digitizer/PKGBUILD | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mingw-w64-engauge-digitizer/PKGBUILD b/mingw-w64-engauge-digitizer/PKGBUILD index b27effdcc6..521ede3e41 100644 --- a/mingw-w64-engauge-digitizer/PKGBUILD +++ b/mingw-w64-engauge-digitizer/PKGBUILD @@ -4,7 +4,7 @@ _realname=engauge-digitizer pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=12.1 -pkgrel=1 +pkgrel=2 pkgdesc="Extracts data points from images of graphs. (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -16,7 +16,7 @@ msys2_references=( license=('spdx:GPL-2.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-fftw" - "${MINGW_PACKAGE_PREFIX}-log4cpp" + $([[ ${CARCH} == aarch64 ]] || echo "${MINGW_PACKAGE_PREFIX}-log4cpp") "${MINGW_PACKAGE_PREFIX}-openjpeg2" "${MINGW_PACKAGE_PREFIX}-poppler-qt5" "${MINGW_PACKAGE_PREFIX}-qt5-base" @@ -44,6 +44,10 @@ build() { _extra_config+=(CONFIG+=release) fi + if [[ ${CARCH} == aarch64 ]]; then + _extra_config+=("CONFIG+=log4cpp_null") + fi + OPENJPEG_INCLUDE=$(${MINGW_PREFIX}/bin/pkgconf --variable includedir libopenjp2) \ OPENJPEG_LIB=${MINGW_PREFIX}/lib \ POPPLER_INCLUDE=$(${MINGW_PREFIX}/bin/pkgconf --cflags-only-I poppler-qt5 | cut -d ' ' -f 1 | sed 's/^-I//') \