mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-21 21:13:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

net-wireless/sdrpp: Patch out problem compiler flags

Browse Source 
Closes: https://bugs.gentoo.org/934413
Signed-off-by: Eli Burch <eli.burch@burchbytes.com>
This commit is contained in:
Eli Burch
2024-06-18 09:30:49 -07:00
parent 752a239d4d
commit caf3b755ac
3 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch Normal file
View File

@@ -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)

43
net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-remove-compiler-flags.patch Normal file
View File

@@ -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)

6
net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild
View File

@@ -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
}