Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/chicken/, dev-scheme/chicken/files/
Date: Sun, 28 Nov 2021 13:10:43
Message-Id: 1638104821.afca25c9ea1e31e0a194e06d669a80a9cf3ba82b.hattya@gentoo
1 commit: afca25c9ea1e31e0a194e06d669a80a9cf3ba82b
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 28 13:07:01 2021 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 28 13:07:01 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afca25c9
7
8 dev-scheme/chicken: use sed instead of patch
9
10 Package-Manager: Portage-3.0.28, Repoman-3.0.3
11 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
12
13 dev-scheme/chicken/chicken-5.2.0.ebuild | 5 +++--
14 dev-scheme/chicken/files/chicken-ldflags.patch | 11 -----------
15 2 files changed, 3 insertions(+), 13 deletions(-)
16
17 diff --git a/dev-scheme/chicken/chicken-5.2.0.ebuild b/dev-scheme/chicken/chicken-5.2.0.ebuild
18 index 1b2a5a137432..869ed7fcf99a 100644
19 --- a/dev-scheme/chicken/chicken-5.2.0.ebuild
20 +++ b/dev-scheme/chicken/chicken-5.2.0.ebuild
21 @@ -17,8 +17,6 @@ IUSE="doc"
22 RDEPEND=""
23 DEPEND=""
24
25 -PATCHES=( "${FILESDIR}"/${PN}-ldflags.patch )
26 -
27 src_prepare() {
28 default
29
30 @@ -33,6 +31,9 @@ src_prepare() {
31 -e "s|/lib|/$(get_libdir)|" \
32 -e "s|\$(DATADIR)/doc|\$(SHAREDIR)/doc/${PF}|" \
33 defaults.make || die
34 + sed -i \
35 + -e "/\$(CHICKEN_DO_PROGRAM)\$(EXE):/,/^$/s/\(\$<\)/\$(LINKER_OPTIONS) \1/" \
36 + rules.make || die
37
38 use doc || sed -i "/\$(SEP)manual/d" rules.make || die
39 }
40
41 diff --git a/dev-scheme/chicken/files/chicken-ldflags.patch b/dev-scheme/chicken/files/chicken-ldflags.patch
42 deleted file mode 100644
43 index 4523526e44a4..000000000000
44 --- a/dev-scheme/chicken/files/chicken-ldflags.patch
45 +++ /dev/null
46 @@ -1,11 +0,0 @@
47 ---- a/rules.make
48 -+++ b/rules.make
49 -@@ -253,7 +253,7 @@
50 - # "chicken-do"
51 -
52 - $(CHICKEN_DO_PROGRAM)$(EXE): $(SRCDIR)chicken-do.c
53 -- $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< -o $@
54 -+ $(C_COMPILER) $(C_COMPILER_OPTIONS) $(C_COMPILER_OPTIMIZATION_OPTIONS) $(LINKER_OPTIONS) $< -o $@
55 -
56 - # scripts
57 -