From caf3b755ac6cd4f15773fc9bb309db010b25befc Mon Sep 17 00:00:00 2001
From: Eli Burch <eli.burch@burchbytes.com>
Date: Tue, 18 Jun 2024 09:30:49 -0700
Subject: net-wireless/sdrpp: Patch out problem compiler flags

Closes: https://bugs.gentoo.org/934413
Signed-off-by: Eli Burch <eli.burch@burchbytes.com>
---
 .../files/sdrpp-1.2.0_pre20240607-lib64.patch      | 10 +++++
 ...p-1.2.0_pre20240607-remove-compiler-flags.patch | 43 ++++++++++++++++++++++
 net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild  |  6 ++-
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
 create mode 100644 net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch

(limited to 'net-wireless')

diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
new file mode 100644
index 000000000..4aadaf719
--- /dev/null
+++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch
@@ -0,0 +1,10 @@
+# Patch lib directory
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -167,4 +167,4 @@ set(CORE_FILES ${RUNTIME_OUTPUT_DIRECTORY} PARENT_SCOPE)
+ # cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake"
+ 
+ # Install directives
+-install(TARGETS sdrpp_core DESTINATION lib)
+\ No newline at end of file
++install(TARGETS sdrpp_core DESTINATION lib64)
diff --git a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch
new file mode 100644
index 000000000..f37a44312
--- /dev/null
+++ b/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0726e57..af67d19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -85,9 +85,9 @@ else()
+     if (MSVC)
+         set(SDRPP_COMPILER_FLAGS /O2 /Ob2 /std:c++17 /EHsc)
+     elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-        set(SDRPP_COMPILER_FLAGS -O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
++        set(SDRPP_COMPILER_FLAGS  -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
+     else ()
+-        set(SDRPP_COMPILER_FLAGS -O3 -std=c++17)
++        set(SDRPP_COMPILER_FLAGS -std=c++17)
+     endif ()
+ endif()
+ set(SDRPP_MODULE_COMPILER_FLAGS ${SDRPP_COMPILER_FLAGS})
+@@ -354,4 +354,4 @@ endif ()
+ configure_file(${CMAKE_SOURCE_DIR}/cmake_uninstall.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake @ONLY)
+ add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+ 
+-# Create headers target
+\ No newline at end of file
++# Create headers target
+diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
+index 7fce281..5a26430 100644
+--- a/core/libcorrect/CMakeLists.txt
++++ b/core/libcorrect/CMakeLists.txt
+@@ -27,12 +27,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+     endif()
+ else()
+   if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
+-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
++      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+     else()
+-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
++      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+   endif()
+   if(CMAKE_BUILD_TYPE STREQUAL "Profiling")
+-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g3")
++      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
+   endif()
+ endif()
+ endif(MSVC)
diff --git a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
index cac3f4449..f6d3016c4 100644
--- a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
+++ b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
@@ -61,6 +61,10 @@ DEPEND="sci-libs/fftw
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch"
+)
+
 src_unpack(){
 	default
 	mv SDRPlusPlus* "${P}" || die
@@ -69,7 +73,7 @@ src_unpack(){
 src_prepare(){
 	if [ "${ARCH}" = "amd64" ];
 	then
-		eapply "${FILESDIR}/lib64.patch"
+		eapply "${FILESDIR}/sdrpp-1.2.0_pre20240607-lib64.patch"
 	fi
 	cmake_src_prepare
 }
-- 
cgit v1.2.3-65-gdbad