commit: 02ecef7626c6add4e6df2b96a8f8098f57cd5aff Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Sun Jun 21 14:44:08 2020 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Jun 21 14:57:53 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ecef76
app-editors/elvis: various fixes. * remove colons as sed delimiters. * honour CFLAGS. Closes: https://bugs.gentoo.org/710346 Closes: https://bugs.gentoo.org/722058 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-editors/elvis/elvis-2.2.0-r8.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild index 4ac39947e0d..d5c65e2ef42 100644 --- a/app-editors/elvis/elvis-2.2.0-r8.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -40,6 +40,7 @@ PATCHES=( ) src_configure() { + export CC="$(tc-getCC)" ./configure \ --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ --prefix="${EPREFIX}"/usr \ @@ -51,7 +52,8 @@ src_configure() { # Some Makefile fixups (must happen after configure) # Use our CFLAGS - sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 failed" + sed -e "s#^CFLAGS=\(.*\)#CFLAGS=\1 ${CFLAGS}#g;" -i Makefile || \ + die "sed 1 failed" # We'll install the man-pages ourselves sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed"
