From 3e2da1ad3c13e8345126ed983dfd68f72c70d5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 8 Jan 2018 22:31:15 +0100 Subject: [PATCH] monero-core: fix armv[56]* --- srcpkgs/monero-core/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/monero-core/template b/srcpkgs/monero-core/template index 0a0cb2da3f7..12fd9141b2d 100644 --- a/srcpkgs/monero-core/template +++ b/srcpkgs/monero-core/template @@ -19,6 +19,11 @@ checksum=39870b40b81cfe986c4ccd379fdde2cf34dabe8e427f7a9723e73ec9ee4ceae0 pre_configure() { echo "var GUI_VERSION = \"${version}\"" > version.js echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js + case "$XBPS_TARGET_MACHINE" in + armv[56]*) # armv[56]* need to link libatomic.a for __atomic_fetch_sub_8 + sed -i *.pro -e "s;-lreadline ;-lreadline -latomic ;" + ;; + esac } pre_build() { @@ -26,10 +31,11 @@ pre_build() { # The dictgen binary is executed during the build to generate code # but is not included in the binary package. It thus needs to be # built for the host - CXX=${CXX_host} CXXFLAGS=${XBPS_CXXFLAGS} LDFLAGS=${XBPS_LDFLAGS} make -j ${XBPS_MAKEJOBS} -C src/zxcvbn-c dictgen + CXX=${CXX_host} CXXFLAGS="${XBPS_CXXFLAGS}" LDFLAGS="${XBPS_LDFLAGS}" \ + make ${makejobs} -C src/zxcvbn-c dictgen fi - make -j ${XBPS_MAKEJOBS} -C src/zxcvbn-c + make ${makejobs} -C src/zxcvbn-c } do_install() {