commit: 16084cb3d2ea0c8207e93d9b14366816f5044ddc Author: Eli Burch <eli.burch <AT> burchbytes <DOT> com> AuthorDate: Sun Jun 23 19:34:27 2024 +0000 Commit: Eli Burch <redawl <AT> burchbytes <DOT> com> CommitDate: Sun Jun 23 19:35:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=16084cb3
net-wireless/sdrpp: Use get_libdir to get correct libdir Signed-off-by: Eli Burch <eli.burch <AT> burchbytes.com> net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch | 10 ---------- net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild | 6 ++---- 2 files changed, 2 insertions(+), 14 deletions(-) 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 deleted file mode 100644 index 4aadaf719..000000000 --- a/net-wireless/sdrpp/files/sdrpp-1.2.0_pre20240607-lib64.patch +++ /dev/null @@ -1,10 +0,0 @@ -# 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/sdrpp-1.2.0_pre20240607.ebuild b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild index f6d3016c4..50927ee6b 100644 --- a/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild +++ b/net-wireless/sdrpp/sdrpp-1.2.0_pre20240607.ebuild @@ -71,10 +71,8 @@ src_unpack(){ } src_prepare(){ - if [ "${ARCH}" = "amd64" ]; - then - eapply "${FILESDIR}/sdrpp-1.2.0_pre20240607-lib64.patch" - fi + sed -i "s@install(TARGETS sdrpp_core DESTINATION lib)@install(TARGETS sdrpp_core DESTINATION $(get_libdir))@" \ + "core/CMakeLists.txt" || die cmake_src_prepare }