commit: afca25c9ea1e31e0a194e06d669a80a9cf3ba82b
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 28 13:07:01 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Nov 28 13:07:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afca25c9
dev-scheme/chicken: use sed instead of patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/chicken/chicken-5.2.0.ebuild | 5 +++--
dev-scheme/chicken/files/chicken-ldflags.patch | 11 -----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/dev-scheme/chicken/chicken-5.2.0.ebuild
b/dev-scheme/chicken/chicken-5.2.0.ebuild
index 1b2a5a137432..869ed7fcf99a 100644
--- a/dev-scheme/chicken/chicken-5.2.0.ebuild
+++ b/dev-scheme/chicken/chicken-5.2.0.ebuild
@@ -17,8 +17,6 @@ IUSE="doc"
RDEPEND=""
DEPEND=""
-PATCHES=( "${FILESDIR}"/${PN}-ldflags.patch )
-
src_prepare() {
default
@@ -33,6 +31,9 @@ src_prepare() {
-e "s|/lib|/$(get_libdir)|" \
-e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
defaults.make || die
+ sed -i \
+ -e
"/\$(CHICKEN_DO_PROGRAM)\$(EXE):/,/^$/s/\(\$<\)/\$(LINKER_OPTIONS) \1/" \
+ rules.make || die
use doc || sed -i "/\$(SEP)manual/d" rules.make || die
}
diff --git a/dev-scheme/chicken/files/chicken-ldflags.patch
b/dev-scheme/chicken/files/chicken-ldflags.patch
deleted file mode 100644
index 4523526e44a4..000000000000
--- a/dev-scheme/chicken/files/chicken-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rules.make
-+++ b/rules.make
-@@ -253,7 +253,7 @@
- # "chicken-do"
-
- $(CHICKEN_DO_PROGRAM)$(EXE): $(SRCDIR)chicken-do.c
-- $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_OPTIMIZATION_OPTIONS)
$< -o $@
-+ $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_OPTIMIZATION_OPTIONS)
$(LINKER_OPTIONS) $< -o $@
-
- # scripts
-
