From 94221dc2d7de79fa7396aa6a8f8f340ef4fc42a6 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Sat, 6 Mar 2021 13:00:27 +1100 Subject: [PATCH] monero-gui: fix cross. We moved to ninja cmake generator so generate_translation_headers was not being generated properly as a makefile. Moving to ninja for the building command solves this issue. --- srcpkgs/monero-gui/template | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template index f6e08f8bef824b..6ed3b0f5ce6a3b 100644 --- a/srcpkgs/monero-gui/template +++ b/srcpkgs/monero-gui/template @@ -35,8 +35,6 @@ checksum="3a924b4e08b557d93337a0c05826a9fa95e5cf8c503aff0ecb3676be45db1d14 skip_extraction="monero-${version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz v${_randomx_version}.tar.gz ${_quirc_gitrev}.tar.gz" -nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/31154/steps/shell_3/logs/stdio" - if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" CFLAGS+=" -latomic" @@ -58,8 +56,6 @@ case "$XBPS_TARGET_MACHINE" in *) configure_args+=" -DARCH=default" ;; esac - - post_extract() { bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/monero-${_monero_version}.tar.gz --strip-components 1 -C monero bsdtar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_rapidjson_gitrev}.tar.gz --strip-components 1 -C monero/external/rapidjson @@ -95,7 +91,7 @@ pre_build() { # but is not included in the binary package. It thus needs to be # built for the host CC=${CC_host} CFLAGS="${XBPS_CFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \ - make -C build/monero ${makejobs} generate_translations_header + ninja -C build ${makejobs} generate_translations_header fi make ${makejobs} -C src/zxcvbn-c