| 1 |
commit: 1bd3be25dcc2b45c43673525de5ce880dbda0012 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 10 09:57:56 2020 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 10 10:24:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd3be25 |
| 7 |
|
| 8 |
app-editors/fe: Call tc-getAR to determine the ar program. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/722036 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-editors/fe/fe-2.0.ebuild | 11 +++++++++-- |
| 15 |
app-editors/fe/files/fe-2.0-ar.patch | 21 +++++++++++++++++++++ |
| 16 |
2 files changed, 30 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0.ebuild |
| 19 |
index ca6658d9407..207e9ec3f77 100644 |
| 20 |
--- a/app-editors/fe/fe-2.0.ebuild |
| 21 |
+++ b/app-editors/fe/fe-2.0.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=7 |
| 28 |
@@ -19,7 +19,10 @@ RDEPEND="sys-libs/ncurses:0= |
| 29 |
DEPEND="${RDEPEND}" |
| 30 |
BDEPEND="virtual/pkgconfig" |
| 31 |
|
| 32 |
-PATCHES=("${FILESDIR}"/${PN}-1.8-makefile.patch) |
| 33 |
+PATCHES=( |
| 34 |
+ "${FILESDIR}"/${PN}-1.8-makefile.patch |
| 35 |
+ "${FILESDIR}"/${P}-ar.patch |
| 36 |
+) |
| 37 |
|
| 38 |
src_configure() { |
| 39 |
econf \ |
| 40 |
@@ -27,6 +30,10 @@ src_configure() { |
| 41 |
LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" |
| 42 |
} |
| 43 |
|
| 44 |
+src_compile() { |
| 45 |
+ emake AR="$(tc-getAR)" |
| 46 |
+} |
| 47 |
+ |
| 48 |
src_install() { |
| 49 |
emake \ |
| 50 |
prefix="${D}"/usr \ |
| 51 |
|
| 52 |
diff --git a/app-editors/fe/files/fe-2.0-ar.patch b/app-editors/fe/files/fe-2.0-ar.patch |
| 53 |
new file mode 100644 |
| 54 |
index 00000000000..8096400ab01 |
| 55 |
--- /dev/null |
| 56 |
+++ b/app-editors/fe/files/fe-2.0-ar.patch |
| 57 |
@@ -0,0 +1,21 @@ |
| 58 |
+https://bugs.gentoo.org/722036 |
| 59 |
+ |
| 60 |
+--- fe-2.0-orig/Makefile.in |
| 61 |
++++ fe-2.0/Makefile.in |
| 62 |
+@@ -15,6 +15,7 @@ |
| 63 |
+ CPPFLAGS= @CPPFLAGS@ -DLOCALEDIR=\"$(localedir)\" |
| 64 |
+ LDFLAGS= @LDFLAGS@ |
| 65 |
+ LIBS= @LIBS@ |
| 66 |
++AR= ar |
| 67 |
+ |
| 68 |
+ CATALOGS= de.mo |
| 69 |
+ OBJS= buffer.o complete.o display.o macro.o misc.o msgline.o |
| 70 |
+@@ -27,7 +28,7 @@ |
| 71 |
+ $(CC) -o $@ $(LDFLAGS) fe.o libfe.a $(LIBS) |
| 72 |
+ |
| 73 |
+ libfe.a: $(OBJS) |
| 74 |
+- rm -f $@; ar q $@ $(OBJS); @RANLIB@ $@ |
| 75 |
++ rm -f $@; $(AR) q $@ $(OBJS); @RANLIB@ $@ |
| 76 |
+ |
| 77 |
+ install-po: install-po-@USE_NLS@ |
| 78 |
+ install-po-no: |
Archives