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

net-p2p/feather: stop monero subdirectory from touching cflags

Browse Source 
Closes: https://bugs.gentoo.org/892577
Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
This commit is contained in:
Adam Pimentel
2023-02-03 01:12:11 -05:00
parent aa6ca171e0
commit 012161af0b
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net-p2p/feather/feather-2.2.3.ebuild
View File

@@ -98,9 +98,10 @@ src_prepare() {
default
echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
eapply "${FILESDIR}"/feather_remove_cflags.patch
eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
pushd monero || die
eapply "${FILESDIR}"/monero_add_some_includes.patch
eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
eapply "${FILESDIR}"/monero_add_some_includes-${PV}.patch
popd || die
cmake_src_prepare
}

0
net-p2p/feather/files/feather_remove_cflags.patch → net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
View File

0
net-p2p/feather/files/monero_add_some_includes.patch → net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
View File

15
net-p2p/feather/files/monero_remove_cflags-2.2.3.patch Normal file
View File

@@ -0,0 +1,15 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -901,9 +901,9 @@
message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
# With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
# is fixed in the code (Issue #847), force compiler to be conservative.