[gentoo-commits] repo/proj/guru:dev commit in: net-p2p/p2pool/, net-p2p/p2pool/files/

["Adam Pimentel" <adam.pimentel@protonmail.com>]

commit:     3a7aea9dfccabfca58a173e752ab136e52457b1f
Author:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
AuthorDate: Sun Dec 25 21:31:23 2022 +0000
Commit:     Adam Pimentel <adam.pimentel <AT> protonmail <DOT> com>
CommitDate: Sun Dec 25 21:31:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a7aea9d

net-p2p/p2pool: stop build script from overriding users CFLAGS and CXXFLAGS

Closes: https://bugs.gentoo.org/887903
Closes: https://bugs.gentoo.org/887905
Signed-off-by: Adam Pimentel <adam.pimentel <AT> protonmail.com>

 net-p2p/p2pool/files/flags.cmake    | 14 ++++++++++++++
 net-p2p/p2pool/p2pool-2.6-r1.ebuild |  5 +++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/net-p2p/p2pool/files/flags.cmake b/net-p2p/p2pool/files/flags.cmake
new file mode 100644
index 000000000..ed7e75499
--- /dev/null
+++ b/net-p2p/p2pool/files/flags.cmake
@@ -0,0 +1,14 @@
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_CXX_STANDARD 14)
+
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+
+set(GENERAL_FLAGS "-pthread")
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${GENERAL_FLAGS}")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${GENERAL_FLAGS}")
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GENERAL_FLAGS}")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${GENERAL_FLAGS}")

diff --git a/net-p2p/p2pool/p2pool-2.6-r1.ebuild b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
index 5b1d81a5e..960bce71a 100644
--- a/net-p2p/p2pool/p2pool-2.6-r1.ebuild
+++ b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
@@ -69,8 +69,9 @@ src_unpack() {
 src_prepare() {
 	default
 
-	# 884447: remove -s from OPTIMIZATION_FLAGS
-	sed -i 's/-s\>//' cmake/flags.cmake || die
+	# Stop their script from overriding flags:
+	cp "${FILESDIR}"/flags.cmake cmake/flags.cmake || die
+	die
 
 	cmake_src_prepare
 }