commit: 589994af5895f33871c58b02ceceaef139907e53 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Jan 28 21:29:59 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Jan 28 21:43:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=589994af
sys-devel/sparse: install into /usr, not $HOME, bug #676626 Daniel noticed sparse-9999 installs into /tmp due to upstream switch to 'PREFIX ?= $(HOME)'. Cleaned up live ebuild to stop mangling MAKEOPTS. Reported-by: Daniel M. Weeks Closes: https://bugs.gentoo.org/676626 Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-devel/sparse/sparse-9999.ebuild | 44 +++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild index 8850a866452..41c95d2e55f 100644 --- a/sys-devel/sparse/sparse-9999.ebuild +++ b/sys-devel/sparse/sparse-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit eutils multilib toolchain-funcs @@ -28,14 +28,36 @@ DEPEND="${RDEPEND} gtk? ( virtual/pkgconfig ) xml? ( virtual/pkgconfig )" -src_prepare() { - tc-export AR CC PKG_CONFIG - sed -i \ - -e '/^PREFIX=/s:=.*:=/usr:' \ - -e "/^LIBDIR=/s:/lib:/$(get_libdir):" \ - -e '/^COMMON_CFLAGS =/{s:=:= $(CPPFLAGS):;s:-O2 -finline-functions -fno-strict-aliasing -g:-fno-strict-aliasing:}' \ - -e "s:pkg-config:${PKG_CONFIG}:" \ - Makefile || die - export MAKEOPTS+=" V=1 AR=${AR} CC=${CC} HAVE_GTK2=$(usex gtk) HAVE_LLVM=$(usex llvm) HAVE_LIBXML=$(usex xml)" - default +_emake() { + # Makefile does not allow for an easy override of flags. + # Collect them here and override default phases. + emake \ + CC="$(tc-getCC)" \ + LD="$(tc-getCC)" \ + AR="$(tc-getAR)" \ + CFLAGS="${CFLAGS}" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + \ + HAVE_GTK=$(usex gtk) \ + HAVE_LLVM=$(usex llvm) \ + HAVE_LIBXML=$(usex xml) \ + \ + V=1 \ + PREFIX="${EPREFIX}/usr" \ + \ + "$@" +} + +src_compile() { + _emake +} + +src_test() { + _emake check +} + +src_install() { + _emake DESTDIR="${D}" install + + dodoc FAQ README }
