public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/bfgminer/files/, net-misc/bfgminer/
@ 2021-10-31  3:06 Sam James
  0 siblings, 0 replies; only message in thread
From: Sam James @ 2021-10-31  3:06 UTC (permalink / raw
  To: gentoo-commits

commit:     b4be638d4edd1a5128130ae9aee2f63b6c7626a8
Author:     Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Tue Oct 26 21:41:13 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 03:05:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4be638d

net-misc/bfgminer: Upstream patch to fix build failure with USE=-cpumining

Closes: https://bugs.gentoo.org/775560
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
Closes: https://github.com/gentoo/gentoo/pull/22718
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild         |  1 +
 .../files/bfgminer-5.5.0-cpus-undefined.patch      | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild b/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
index 462ec0a7d8d..af67aaf1fed 100644
--- a/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
+++ b/net-misc/bfgminer/bfgminer-5.5.0-r2.ebuild
@@ -120,6 +120,7 @@ DEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.5.0-fno-common.patch"
+	"${FILESDIR}/${PN}-5.5.0-cpus-undefined.patch"
 )
 
 src_configure() {

diff --git a/net-misc/bfgminer/files/bfgminer-5.5.0-cpus-undefined.patch b/net-misc/bfgminer/files/bfgminer-5.5.0-cpus-undefined.patch
new file mode 100644
index 00000000000..f9f0f43609e
--- /dev/null
+++ b/net-misc/bfgminer/files/bfgminer-5.5.0-cpus-undefined.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/775560
+
+commit 83f83d2cbc5e3044b314b914beb32dbb83a0055e
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date:   Tue Feb 9 15:39:56 2021 +0000
+
+    Bugfix: miner: Can't free cpus in non-cpumining builds anymore
+
+diff --git a/miner.c b/miner.c
+index 075ea4655..de62f13a0 100644
+--- a/miner.c
++++ b/miner.c
+@@ -11197,8 +11197,10 @@ void _bfg_clean_up(bool restarting)
+ 			print_summary();
+ 	}
+ 
++#ifdef USE_CPUMINING
+ 	if (opt_n_threads > 0)
+ 		free(cpus);
++#endif
+ 
+ 	curl_global_cleanup();
+ 	


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-10-31  3:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-31  3:06 [gentoo-commits] repo/gentoo:master commit in: net-misc/bfgminer/files/, net-misc/bfgminer/ Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox