* [gentoo-commits] repo/gentoo:master commit in: net-misc/xmrig/, net-misc/xmrig/files/
@ 2021-08-11 23:03 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-08-11 23:03 UTC (permalink / raw
To: gentoo-commits
commit: f08993a09f29a42b693fd385ed5777323c67441b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 23:02:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 23:03:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08993a0
net-misc/xmrig: backport arm64 narrowing conversion patch
Needed for arches with unsigned char to fix compilation.
Bug: https://github.com/xmrig/xmrig/issues/2527
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xmrig-6.14.0-narrowing-conversion-arm64.patch | 27 ++++++++++++++++++++++
net-misc/xmrig/xmrig-6.14.0.ebuild | 5 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch b/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
new file mode 100644
index 00000000000..7f1f1bb4da7
--- /dev/null
+++ b/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
@@ -0,0 +1,27 @@
+Fixes build on arm64 (and other platforms with unsigned char).
+
+https://github.com/xmrig/xmrig/commit/f4cdc527b00571150e8521331928c75b44e071f9.patch
+https://github.com/xmrig/xmrig/issues/2527
+
+From f4cdc527b00571150e8521331928c75b44e071f9 Mon Sep 17 00:00:00 2001
+From: XMRig <support@xmrig.com>
+Date: Tue, 10 Aug 2021 01:40:36 +0700
+Subject: [PATCH] #2527 Fix narrowing conversion.
+
+---
+ src/base/net/stratum/DaemonClient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
+index 77818f34c..76f30c653 100644
+--- a/src/base/net/stratum/DaemonClient.cpp
++++ b/src/base/net/stratum/DaemonClient.cpp
+@@ -65,7 +65,7 @@ static const char *kJsonRPC = "/json_rpc";
+
+ static constexpr size_t kBlobReserveSize = 8;
+
+-static const char kZMQGreeting[64] = { -1, 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
++static const char kZMQGreeting[64] = { static_cast<char>(-1), 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
+ static constexpr size_t kZMQGreetingSize1 = 11;
+
+ static const char kZMQHandshake[] = "\4\x19\5READY\xbSocket-Type\0\0\0\3SUB";
diff --git a/net-misc/xmrig/xmrig-6.14.0.ebuild b/net-misc/xmrig/xmrig-6.14.0.ebuild
index 97dc2905531..454bae8f972 100644
--- a/net-misc/xmrig/xmrig-6.14.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.14.0.ebuild
@@ -30,7 +30,10 @@ RDEPEND="
!arm64? ( sys-apps/msr-tools )
"
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+ "${FILESDIR}"/${PN}-6.14.0-narrowing-conversion-arm64.patch
+)
src_prepare() {
if ! use donate ; then
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/xmrig/, net-misc/xmrig/files/
@ 2021-09-24 13:23 Craig Andrews
0 siblings, 0 replies; 4+ messages in thread
From: Craig Andrews @ 2021-09-24 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 7e4c82fa0c45f65c301ce26195d2f4e218c148d2
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 24 13:22:53 2021 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Sep 24 13:22:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4c82fa
net-misc/xmrig: Cleanup old versions
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
net-misc/xmrig/Manifest | 6 --
.../xmrig-6.14.0-narrowing-conversion-arm64.patch | 27 ---------
net-misc/xmrig/xmrig-6.12.2.ebuild | 62 ---------------------
net-misc/xmrig/xmrig-6.13.0.ebuild | 62 ---------------------
net-misc/xmrig/xmrig-6.13.1.ebuild | 62 ---------------------
net-misc/xmrig/xmrig-6.14.0.ebuild | 65 ----------------------
net-misc/xmrig/xmrig-6.14.1.ebuild | 64 ---------------------
net-misc/xmrig/xmrig-6.15.0.ebuild | 64 ---------------------
net-misc/xmrig/xmrig-6.15.1.ebuild | 64 ---------------------
9 files changed, 476 deletions(-)
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 9862f7a07be..48ef5e13cc5 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,7 +1 @@
-DIST xmrig-6.12.2.tar.gz 1628708 BLAKE2B 4fca418c7e0d6df25c84609d657a050f7df6383d0a5ee3a4ebf87ff26805d4f445d6c184df1651813e21ac4c972e0681d37ccb45a493cb4d1e199a6ba5e707c5 SHA512 a1e8d37955177f0988b0683c9b92dc6eef4bcaea68b3c1411917929a0573119cd13107e5a68a2a7971ec45bf2554aed5fc7d82c11d49e7411e95d9b81fe1a911
-DIST xmrig-6.13.0.tar.gz 1694984 BLAKE2B 6449df3fe7a42c5caa9050d0e7ef8723cb36175d6e624dae04f0c7d68670a41f705e8676acb6a377c35d7d572ca6e42ae0833bbf8fcb84ebdefa7a50027b0151 SHA512 49e55aef9c316b14b5974f58c3083486f097c1d2bfec10b0e615efcfb642b0186f2de866b5b88eb9fe2ee0153dd3ff7749936d142825928c68e96595478b9dc8
-DIST xmrig-6.13.1.tar.gz 1695005 BLAKE2B 8094a7f247d1b1f714a22fcdddcbede0d859f4883c6fcb1789ce134bdae31875da434679bdb141cd332a575ca0e4fa80b8ca96e603e8c381e9073c58394abe71 SHA512 f1a4e11f6e13bd275f2d867f1a4826cb244bdc9d157e590870ebc4dcd3cafc522bf7f46cfb4eb81e129fc3f9dbef59219288088c42e8f6b876ac16b5b6224323
-DIST xmrig-6.14.0.tar.gz 1698011 BLAKE2B 62391c7dde6d3d4fbb4cb78e53c6f704fb277830257148a03fc059e0eebd6a2fc7ba723a1caafe0e3920b15c3abe7a35a774743fdd0d0a800879fdc666ebed45 SHA512 de1cc3543a690a65cb50e629114324e95d4769dc3610c6dde0fff937206df3949907f8a21a4e4533bee71958e6febbaf4a23c3092c1e67a763f4ffea11770591
-DIST xmrig-6.14.1.tar.gz 1698951 BLAKE2B 99a0b3407aa0f0d835e04b407350c07f6e3adaf10e839217343aa56368d61665a2a83b75d4965c3573cb46018f20918c34cab295edd5c8398d0e7581e414976e SHA512 11d877e6b96f224fe317f74e019cf5df22a267d1b89c3d8ee775a2e3508e4d2f276f7ce9de5cc09430f8a8f56183595166f75d10bd8a3598530daec3bffb7788
-DIST xmrig-6.15.0.tar.gz 1742192 BLAKE2B 6495a48b9cc9e5a2ef851d6ffbeb0f1e3ce2fbd4ae3aaaef8acffcdff157006622a51fc23b2337933b1ced100a38fee334b240188aacaf8263f1806a39492f1f SHA512 e3f9af9fdf19512cddbb1f1a5655f9710fba486bc6f4a4eda6661ad7201d8909ada1308890dccf34af65d18cd687390c238b9b3522af6c1cafb360713ceb2985
DIST xmrig-6.15.1.tar.gz 1743106 BLAKE2B d98537cbc75f7ce9e1c0db8ef3e23d7dd198f0d30b3feb26bac6e24649fdcfd503f27651c36674af259903cca6fbfdc9a407923a870be2ba586528fe84cfc529 SHA512 18438e6d6140b255ec24104baf20cb7b333520405fcbff1e3a5ad6b4794b7f9178d73baea48d8c2d05490fba75365102212639152d60ba79af89e0275a989e24
diff --git a/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch b/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
deleted file mode 100644
index 7f1f1bb4da7..00000000000
--- a/net-misc/xmrig/files/xmrig-6.14.0-narrowing-conversion-arm64.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fixes build on arm64 (and other platforms with unsigned char).
-
-https://github.com/xmrig/xmrig/commit/f4cdc527b00571150e8521331928c75b44e071f9.patch
-https://github.com/xmrig/xmrig/issues/2527
-
-From f4cdc527b00571150e8521331928c75b44e071f9 Mon Sep 17 00:00:00 2001
-From: XMRig <support@xmrig.com>
-Date: Tue, 10 Aug 2021 01:40:36 +0700
-Subject: [PATCH] #2527 Fix narrowing conversion.
-
----
- src/base/net/stratum/DaemonClient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
-index 77818f34c..76f30c653 100644
---- a/src/base/net/stratum/DaemonClient.cpp
-+++ b/src/base/net/stratum/DaemonClient.cpp
-@@ -65,7 +65,7 @@ static const char *kJsonRPC = "/json_rpc";
-
- static constexpr size_t kBlobReserveSize = 8;
-
--static const char kZMQGreeting[64] = { -1, 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
-+static const char kZMQGreeting[64] = { static_cast<char>(-1), 0, 0, 0, 0, 0, 0, 0, 0, 127, 3, 0, 'N', 'U', 'L', 'L' };
- static constexpr size_t kZMQGreetingSize1 = 11;
-
- static const char kZMQHandshake[] = "\4\x19\5READY\xbSocket-Type\0\0\0\3SUB";
diff --git a/net-misc/xmrig/xmrig-6.12.2.ebuild b/net-misc/xmrig/xmrig-6.12.2.ebuild
deleted file mode 100644
index 809b9c2c5aa..00000000000
--- a/net-misc/xmrig/xmrig-6.12.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.13.0.ebuild b/net-misc/xmrig/xmrig-6.13.0.ebuild
deleted file mode 100644
index 97dc2905531..00000000000
--- a/net-misc/xmrig/xmrig-6.13.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.13.1.ebuild b/net-misc/xmrig/xmrig-6.13.1.ebuild
deleted file mode 100644
index 97dc2905531..00000000000
--- a/net-misc/xmrig/xmrig-6.13.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-6.12.2-nonotls.patch )
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.14.0.ebuild b/net-misc/xmrig/xmrig-6.14.0.ebuild
deleted file mode 100644
index 454bae8f972..00000000000
--- a/net-misc/xmrig/xmrig-6.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.12.2-nonotls.patch
- "${FILESDIR}"/${PN}-6.14.0-narrowing-conversion-arm64.patch
-)
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.14.1.ebuild b/net-misc/xmrig/xmrig-6.14.1.ebuild
deleted file mode 100644
index dff470d9373..00000000000
--- a/net-misc/xmrig/xmrig-6.14.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.15.0.ebuild b/net-misc/xmrig/xmrig-6.15.0.ebuild
deleted file mode 100644
index 8ad79070a47..00000000000
--- a/net-misc/xmrig/xmrig-6.15.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
diff --git a/net-misc/xmrig/xmrig-6.15.1.ebuild b/net-misc/xmrig/xmrig-6.15.1.ebuild
deleted file mode 100644
index 8ad79070a47..00000000000
--- a/net-misc/xmrig/xmrig-6.15.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
-HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64"
-fi
-
-LICENSE="Apache-2.0 GPL-3+ MIT"
-SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 donate hwloc +ssl"
-
-DEPEND="
- dev-libs/libuv:=
- hwloc? ( sys-apps/hwloc:= )
- ssl? ( dev-libs/openssl:= )
-"
-RDEPEND="
- ${DEPEND}
- !arm64? ( sys-apps/msr-tools )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.12.2-nonotls.patch
-)
-
-src_prepare() {
- if ! use donate ; then
- sed -i 's/1;/0;/g' src/donate.h || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DWITH_HWLOC=$(usex hwloc)
- -DWITH_TLS=$(usex ssl)
- -DWITH_OPENCL=OFF
- -DWITH_CUDA=OFF
- )
-
- cmake_src_configure
-}
-
-src_install() {
- default
- keepdir /etc/xmrig
- systemd_dounit "${FILESDIR}"/xmrig.service
- dobin "${BUILD_DIR}/xmrig"
- dobin "${S}/scripts/enable_1gb_pages.sh"
- dobin "${S}/scripts/randomx_boost.sh"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/xmrig/, net-misc/xmrig/files/
@ 2021-11-01 14:30 Craig Andrews
0 siblings, 0 replies; 4+ messages in thread
From: Craig Andrews @ 2021-11-01 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 3230194e8d711676b8f6b32f11aa40a80908d7ef
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 1 14:30:18 2021 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Nov 1 14:30:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3230194e
net-misc/xmrig: 6.15.3 version bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
net-misc/xmrig/Manifest | 1 +
net-misc/xmrig/files/xmrig.service | 1 +
net-misc/xmrig/xmrig-6.15.3.ebuild | 65 ++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index d9a34f1be23..da0fac0fc07 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -1,2 +1,3 @@
DIST xmrig-6.15.1.tar.gz 1743106 BLAKE2B d98537cbc75f7ce9e1c0db8ef3e23d7dd198f0d30b3feb26bac6e24649fdcfd503f27651c36674af259903cca6fbfdc9a407923a870be2ba586528fe84cfc529 SHA512 18438e6d6140b255ec24104baf20cb7b333520405fcbff1e3a5ad6b4794b7f9178d73baea48d8c2d05490fba75365102212639152d60ba79af89e0275a989e24
DIST xmrig-6.15.2.tar.gz 1743179 BLAKE2B eabbdb6d901c5b64162e502e5cef131ee8edcec9a93b090067b2cc498227c158aeadff34b505800908b3a5f60b5db70812d1c5aa8330ec73de80b9376d679f74 SHA512 17e8f5bbbd1ce1bd834db0a9d1cae2635390a62ae370c9ab2fada1cde2d49dffde12da7b4c7ab0d61e9b9776067c760b9bb936ac8440c6b825de3e5850559a9c
+DIST xmrig-6.15.3.tar.gz 1744681 BLAKE2B 18ef0f9e0e496bded7fe860218871fc3b321d8cd9182c6694d62115d36383c2854e7b0daac09800ee5b69a1ceac5f7d6cb43695acb40b2f7fc9bfcd8e7fa9a76 SHA512 8c20e2a89405cb7fb3763b6184f6db9dbbdb6628e6d5d3cb62c35d87aa4c54daab5efe8682ed0f0ec3bb6577af0d0e5f41f2f864d52eee41081449e372649a2a
diff --git a/net-misc/xmrig/files/xmrig.service b/net-misc/xmrig/files/xmrig.service
index 16a924aae41..5b5c4c3d293 100644
--- a/net-misc/xmrig/files/xmrig.service
+++ b/net-misc/xmrig/files/xmrig.service
@@ -11,6 +11,7 @@ ExecStart=/usr/bin/xmrig --config=/etc/xmrig/config.json
StandardOutput=journal
StandardError=journal
DynamicUser=true
+Nice=19
CPUSchedulingPolicy=idle
PrivateTmp=true
ProtectHome=true
diff --git a/net-misc/xmrig/xmrig-6.15.3.ebuild b/net-misc/xmrig/xmrig-6.15.3.ebuild
new file mode 100644
index 00000000000..2639977e5a0
--- /dev/null
+++ b/net-misc/xmrig/xmrig-6.15.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="RandomX, CryptoNight, KawPow, AstroBWT, and Argon2 CPU/GPU miner"
+HOMEPAGE="https://xmrig.com https://github.com/xmrig/xmrig"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+ dev-libs/libuv:=
+ hwloc? ( sys-apps/hwloc:= )
+ opencl? ( virtual/opencl )
+ ssl? ( dev-libs/openssl:= )
+"
+RDEPEND="
+ ${DEPEND}
+ !arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+src_prepare() {
+ if ! use donate ; then
+ sed -i 's/1;/0;/g' src/donate.h || die
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+ -DWITH_HWLOC=$(usex hwloc)
+ -DWITH_TLS=$(usex ssl)
+ -DWITH_OPENCL=$(usex opencl)
+ -DWITH_CUDA=OFF
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ default
+ keepdir /etc/xmrig
+ systemd_dounit "${FILESDIR}"/xmrig.service
+ dobin "${BUILD_DIR}/xmrig"
+ dobin "${S}/scripts/enable_1gb_pages.sh"
+ dobin "${S}/scripts/randomx_boost.sh"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/xmrig/, net-misc/xmrig/files/
@ 2023-02-20 16:16 Matthew Smith
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Smith @ 2023-02-20 16:16 UTC (permalink / raw
To: gentoo-commits
commit: c23ab12438ae3a329ba70a674f7fff87ad843901
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 16:14:53 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 16:15:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c23ab124
net-misc/xmrig: fix build with gcc 13
Closes: https://bugs.gentoo.org/895226
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch | 70 ++++++++++++++++++++++
...{xmrig-6.18.1.ebuild => xmrig-6.18.1-r1.ebuild} | 3 +-
...{xmrig-6.19.0.ebuild => xmrig-6.19.0-r1.ebuild} | 1 +
net-misc/xmrig/xmrig-9999.ebuild | 3 +-
4 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch b/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch
new file mode 100644
index 000000000000..1726c3b01523
--- /dev/null
+++ b/net-misc/xmrig/files/xmrig-6.18.1-gcc-13.patch
@@ -0,0 +1,70 @@
+From bd14e6034ba2de0056278c3ad9923199b7f4d20f Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Mon, 20 Feb 2023 16:09:19 +0000
+Subject: [PATCH] Fix build with gcc 13
+
+Now some header files are not included transistively with new
+libstdc++.
+
+Bug: https://bugs.gentoo.org/895226
+--- a/src/backend/opencl/runners/OclBaseRunner.cpp
++++ b/src/backend/opencl/runners/OclBaseRunner.cpp
+@@ -23,6 +23,9 @@
+ */
+
+
++#include <stdexcept>
++
++
+ #include "backend/opencl/runners/OclBaseRunner.h"
+ #include "backend/opencl/cl/OclSource.h"
+ #include "backend/opencl/OclCache.h"
+--- a/src/backend/opencl/runners/OclCnRunner.cpp
++++ b/src/backend/opencl/runners/OclCnRunner.cpp
+@@ -16,6 +16,9 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <stdexcept>
++
++
+ #include "backend/opencl/runners/OclCnRunner.h"
+ #include "backend/opencl/kernels/Cn0Kernel.h"
+ #include "backend/opencl/kernels/Cn1Kernel.h"
+--- a/src/backend/opencl/runners/OclKawPowRunner.cpp
++++ b/src/backend/opencl/runners/OclKawPowRunner.cpp
+@@ -16,6 +16,9 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <stdexcept>
++
++
+ #include "backend/opencl/runners/OclKawPowRunner.h"
+ #include "backend/common/Tags.h"
+ #include "3rdparty/libethash/ethash_internal.h"
+--- a/src/backend/opencl/runners/OclRxJitRunner.cpp
++++ b/src/backend/opencl/runners/OclRxJitRunner.cpp
+@@ -16,6 +16,9 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
++#include <stdexcept>
++
++
+ #include "backend/opencl/runners/OclRxJitRunner.h"
+ #include "backend/opencl/cl/rx/randomx_run_gfx803.h"
+ #include "backend/opencl/cl/rx/randomx_run_gfx900.h"
+--- a/src/base/net/http/HttpResponse.h
++++ b/src/base/net/http/HttpResponse.h
+@@ -21,6 +21,7 @@
+ #define XMRIG_HTTPRESPONSE_H
+
+
++#include <cstdint>
+ #include <map>
+ #include <string>
+
+--
+2.39.2
+
diff --git a/net-misc/xmrig/xmrig-6.18.1.ebuild b/net-misc/xmrig/xmrig-6.18.1-r1.ebuild
similarity index 94%
rename from net-misc/xmrig/xmrig-6.18.1.ebuild
rename to net-misc/xmrig/xmrig-6.18.1-r1.ebuild
index 0f1d09c1b7a9..89809b2e8627 100644
--- a/net-misc/xmrig/xmrig-6.18.1.ebuild
+++ b/net-misc/xmrig/xmrig-6.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,6 +33,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+ "${FILESDIR}"/${PN}-6.18.1-gcc-13.patch
)
src_prepare() {
diff --git a/net-misc/xmrig/xmrig-6.19.0.ebuild b/net-misc/xmrig/xmrig-6.19.0-r1.ebuild
similarity index 97%
rename from net-misc/xmrig/xmrig-6.19.0.ebuild
rename to net-misc/xmrig/xmrig-6.19.0-r1.ebuild
index 7f9e7dd2397c..7a4ceae89308 100644
--- a/net-misc/xmrig/xmrig-6.19.0.ebuild
+++ b/net-misc/xmrig/xmrig-6.19.0-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+ "${FILESDIR}"/${PN}-6.18.1-gcc-13.patch
)
src_prepare() {
diff --git a/net-misc/xmrig/xmrig-9999.ebuild b/net-misc/xmrig/xmrig-9999.ebuild
index 5e038e700270..7a4ceae89308 100644
--- a/net-misc/xmrig/xmrig-9999.ebuild
+++ b/net-misc/xmrig/xmrig-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -33,6 +33,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+ "${FILESDIR}"/${PN}-6.18.1-gcc-13.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-20 16:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-11 23:03 [gentoo-commits] repo/gentoo:master commit in: net-misc/xmrig/, net-misc/xmrig/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-09-24 13:23 Craig Andrews
2021-11-01 14:30 Craig Andrews
2023-02-20 16:16 Matthew Smith
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox