diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2020-06-21 16:44:08 +0200 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2020-06-21 16:57:53 +0200 |
| commit | 02ecef7626c6add4e6df2b96a8f8098f57cd5aff (patch) | |
| tree | baebcd6adb6b28941c0ac27698a4fc111baebc3e /app-editors/elvis | |
| parent | app-vim/pyclewn: clean up old. (diff) | |
| download | gentoo-02ecef7626c6add4e6df2b96a8f8098f57cd5aff.tar.gz gentoo-02ecef7626c6add4e6df2b96a8f8098f57cd5aff.tar.bz2 gentoo-02ecef7626c6add4e6df2b96a8f8098f57cd5aff.zip | |
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@gentoo.org>
Diffstat (limited to 'app-editors/elvis')
| -rw-r--r-- | app-editors/elvis/elvis-2.2.0-r8.ebuild | 6 |
1 files 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 4ac39947e0d6..d5c65e2ef429 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" |