From: kruceter <kruceter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: monero: update to 0.18.1.2.
Date: Tue, 15 Nov 2022 00:33:53 +0100 [thread overview]
Message-ID: <20221114233353.KcJyduMCYKRamxEZ3KpNskKXzkyH7nELQZNoCMGCDes@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39721@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2313 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/39721#issuecomment-1314547850
Comment:
@kevcrumb, here is the patch.
```diff
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index c63c46145b..6aab84641c 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -12,7 +12,7 @@ build_style=cmake
configure_args="-DVERSION_IS_RELEASE=true -DQt5_LRELEASE_EXECUTABLE=/usr/bin/lrelease"
hostmakedepends="pkg-config qt5-tools qt5-qmake qt5-quickcontrols qt5-declarative-devel
qt5-svg-devel"
-makedepends="boost-devel libatomic-devel libunwind-devel miniupnpc-devel
+makedepends="boost-devel libunwind-devel miniupnpc-devel
qt5-declarative-devel readline-devel unbound-devel libsodium-devel hidapi-devel
qt5-svg-devel libgcrypt-devel zeromq-devel"
depends="qt5-graphicaleffects qt5-quickcontrols qt5-quickcontrols2 qt5-xmlpatterns"
@@ -76,7 +76,8 @@ pre_configure() {
echo "var GUI_VERSION = \"${version}\"" > version.js
echo "var GUI_MONERO_VERSION = \"${version}\"" >> version.js
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- vsed -i monero/CMakeLists.txt -e '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i monero/CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index dd80d75e70..9ae8710d48 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -62,8 +62,8 @@ post_extract() {
pre_configure() {
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
- sed -i CMakeLists.txt -e \
- '/include(version.cmake)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
+ vsed -i CMakeLists.txt -e \
+ '/if(ANDROID)/i list(APPEND EXTRA_LIBRARIES libatomic.a)'
fi
}
```
I believe it should work. I cannot build monero on my hardware, unfortunately.
I chose to match `if (ANDROID)` because it is the condition for including libatomics for android, but not suited for void. Perfect place to include this library above that control flow construction.
For the side note: I checked whether 0.17.2.3's `CMakeLists.txt` has `include(version.cmake)` or not. And it does not. No clue since when this line was gone from the source code.
next prev parent reply other threads:[~2022-11-14 23:33 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 19:36 [PR PATCH] " kevcrumb
2022-10-04 20:14 ` [PR PATCH] [Updated] " kevcrumb
2022-11-11 20:13 ` kevcrumb
2022-11-12 20:50 ` paper42
2022-11-12 20:51 ` [PR REVIEW] " paper42
2022-11-12 21:28 ` kruceter
2022-11-12 21:29 ` kruceter
2022-11-12 21:46 ` paper42
2022-11-14 19:13 ` [PR PATCH] [Updated] " kevcrumb
2022-11-14 21:21 ` kruceter
2022-11-14 22:03 ` [PR PATCH] [Updated] " kevcrumb
2022-11-14 22:37 ` kevcrumb
2022-11-14 22:39 ` kevcrumb
2022-11-14 23:02 ` kruceter
2022-11-14 23:33 ` kruceter [this message]
2022-11-14 23:49 ` kruceter
2022-11-15 7:53 ` [PR PATCH] [Updated] " kevcrumb
2022-11-16 0:33 ` kruceter
2022-11-16 15:04 ` kevcrumb
2022-11-17 11:46 ` [PR REVIEW] " paper42
2022-11-17 11:46 ` paper42
2022-11-17 11:46 ` paper42
2022-11-17 11:46 ` paper42
2022-11-17 16:33 ` kevcrumb
2022-11-17 16:38 ` kevcrumb
2022-11-17 17:15 ` paper42
2022-11-17 17:31 ` [PR PATCH] [Updated] " kevcrumb
2022-11-17 18:44 ` [PR REVIEW] " paper42
2022-11-17 19:43 ` kevcrumb
2022-11-17 19:45 ` kevcrumb
2022-11-17 21:16 ` [PR PATCH] [Updated] " kevcrumb
2022-11-17 21:21 ` [PR REVIEW] " kruceter
2022-11-17 21:40 ` kevcrumb
2022-11-17 21:46 ` [PR PATCH] [Updated] " kevcrumb
2022-11-18 10:40 ` [PR REVIEW] " kevcrumb
2022-11-18 10:41 ` kevcrumb
2022-11-18 10:43 ` kevcrumb
2022-11-18 10:43 ` kevcrumb
2022-11-18 11:14 ` [PR PATCH] [Merged]: " paper42
2022-12-21 19:13 ` kruceter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221114233353.KcJyduMCYKRamxEZ3KpNskKXzkyH7nELQZNoCMGCDes@z \
--to=kruceter@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).