commit: a6e815bba4145f5f072d8ddd655539060209edea Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> AuthorDate: Sun Jun 21 07:45:03 2020 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Sun Jun 21 07:54:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e815bb
app-misc/ondir: honour CFLAGS, LD and LDFLAGS. Closes: https://bugs.gentoo.org/722338 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> app-misc/ondir/ondir-0.2.4.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app-misc/ondir/ondir-0.2.4.ebuild b/app-misc/ondir/ondir-0.2.4.ebuild index 2f51ec18dee..e3c9190d013 100644 --- a/app-misc/ondir/ondir-0.2.4.ebuild +++ b/app-misc/ondir/ondir-0.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,15 +22,17 @@ src_prepare() { default sed -i \ -e "s:\(/man/.*$\):/share\1:g" \ - -e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed" + -e "s#^CFLAGS=\(.*\)#CFLAGS= \1 ${CFLAGS}#g;" \ + -e "s#^LDFLAGS=\(.*\)#LDFLAGS= \1 ${LDFLAGS}#g;" \ + -i Makefile || die "sed Makefile failed" } src_compile() { emake \ CC="$(tc-getCC)" \ + LD="$(tc-getCC)" \ PREFIX="${EPREFIX}/usr" \ - CONF="${EPREFIX}/etc/ondirrc" \ - LDFLAGS="${LDFLAGS}" + CONF="${EPREFIX}/etc/ondirrc" } src_install() {