From 824bfb75b4fb34efbb8548e32337a8065ad72c59 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 22 Feb 2021 21:19:52 +0100 Subject: [PATCH] akonadi5: fix cross build instead of hacking around to get a host protocolgen bin use qemu --- srcpkgs/akonadi5/patches/protocolgen-cross.patch | 13 ------------- srcpkgs/akonadi5/template | 12 +----------- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 srcpkgs/akonadi5/patches/protocolgen-cross.patch diff --git a/srcpkgs/akonadi5/patches/protocolgen-cross.patch b/srcpkgs/akonadi5/patches/protocolgen-cross.patch deleted file mode 100644 index 4d2a204ce73..00000000000 --- a/srcpkgs/akonadi5/patches/protocolgen-cross.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/private/protocolgen/CMakeLists.txt 2018-01-09 20:34:31.345972552 +0100 -+++ src/private/protocolgen/CMakeLists.txt 2018-01-09 20:45:14.393984830 +0100 -@@ -1,5 +1,10 @@ - project(protocolgen) - -+IF(CMAKE_CROSSCOMPILING) -+ SET(CMAKE_CXX_COMPILER $ENV{CXX_host}) -+ SET(CMAKE_CXX_FLAGS $ENV{XBPS_CXXFLAGS}) -+ENDIF(CMAKE_CROSSCOMPILING) -+ - set(protocolgen_SRCS - main.cpp - cppgenerator.cpp diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template index b2b8229dd4c..3f8ac46f58b 100644 --- a/srcpkgs/akonadi5/template +++ b/srcpkgs/akonadi5/template @@ -4,6 +4,7 @@ version=20.12.2 revision=1 wrksrc="akonadi-${version}" build_style=cmake +build_helper="qemu" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3 shared-mime-info libxslt pkg-config gettext" makedepends="qt5-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql @@ -33,17 +34,6 @@ pre_configure() { fi } -pre_build() { - if [ "$CROSS_BUILD" ]; then - sed -e "s?/usr/${XBPS_CROSS_TRIPLET}??g" \ - -i build/src/private/protocolgen/CMakeFiles/protocolgen.dir/flags.make - sed -e "s?/usr/${XBPS_CROSS_TRIPLET}??g" \ - -i build/src/private/protocolgen/CMakeFiles/protocolgen.dir/link.txt - sed -e 's!\&\& protocolgen!\&\& ../../bin/protocolgen!' \ - -i build/src/private/CMakeFiles/generate_protocol.dir/build.make - fi -} - do_check() { # failing tests are disabled - sqlite tests hang on futex cd build