From 7fd2e3c9f69b8f26701393f6a5bc5d681813c530 Mon Sep 17 00:00:00 2001 From: Michael Zavertkin Date: Sun, 11 Aug 2024 23:18:19 +0700 Subject: [PATCH] net-proxy/byedpi: respect LDFLAGS and die for sed Closes: https://bugs.gentoo.org/937762 Signed-off-by: Michael Zavertkin --- net-proxy/byedpi/byedpi-0.12.ebuild | 8 +++++--- net-proxy/byedpi/byedpi-9999.ebuild | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net-proxy/byedpi/byedpi-0.12.ebuild b/net-proxy/byedpi/byedpi-0.12.ebuild index d78b1e46f7..1d07691253 100644 --- a/net-proxy/byedpi/byedpi-0.12.ebuild +++ b/net-proxy/byedpi/byedpi-0.12.ebuild @@ -14,11 +14,13 @@ KEYWORDS="~amd64" src_compile() { tc-export CC - export CFLAGS - sed -i 's/ -O.\b/ /' Makefile + export CFLAGS LDFLAGS + sed -i 's/ -O.\b/ /' Makefile || die + # respect LDFLAGS + sed -i 's/$(CFLAGS) /$(CFLAGS) $(LDFLAGS) /' Makefile || die # workaround for compiling without -O2 # https://github.com/hufrea/byedpi/commit/3fee8d5aed122f34ec13637f5f4b1502d13cc923 - sed -i 's/inline bool check_port/static inline bool check_port/' extend.c + sed -i 's/inline bool check_port/static inline bool check_port/' extend.c || die default } diff --git a/net-proxy/byedpi/byedpi-9999.ebuild b/net-proxy/byedpi/byedpi-9999.ebuild index 03efb727c4..aedab7b2d2 100644 --- a/net-proxy/byedpi/byedpi-9999.ebuild +++ b/net-proxy/byedpi/byedpi-9999.ebuild @@ -14,7 +14,7 @@ SLOT="0" src_compile() { tc-export CC export CFLAGS LDFLAGS - sed -i 's/ -O.\b/ /' Makefile + sed -i 's/ -O.\b/ /' Makefile || die default }