summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolic <jakov.smolic@sartura.hr>2021-04-03 14:30:41 +0200
committerDavid Seifert <soap@gentoo.org>2021-04-03 14:30:41 +0200
commit513da9e913e15fbff05de1b80f5457fe0edd3a29 (patch)
tree21834643a218655bc948a02ed03346456fd8c1e2 /sys-devel
parentsys-devel/bmake: Bump mk files to 20210330, include additional .mk fixes (diff)
downloadgentoo-513da9e913e15fbff05de1b80f5457fe0edd3a29.tar.gz
gentoo-513da9e913e15fbff05de1b80f5457fe0edd3a29.tar.bz2
gentoo-513da9e913e15fbff05de1b80f5457fe0edd3a29.zip
sys-devel/elftoolchain: Simplify bmake calls, change BINDIR
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild (renamed from sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild)21
1 files changed, 8 insertions, 13 deletions
diff --git a/sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild b/sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild
index f5ede11619da..4eea87b1c581 100644
--- a/sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild
+++ b/sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild
@@ -21,7 +21,7 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-vcs/subversion
sys-apps/lsb-release
- >=sys-devel/bmake-20210206
+ >=sys-devel/bmake-20210314-r1
virtual/yacc"
PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
@@ -36,27 +36,22 @@ src_prepare() {
sed -i -e "s@readelf@$(tc-getREADELF)@" common/native-elf-format || die
}
-_bmake() {
- bmake \
- AR="$(tc-getAR)" \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- RANLIB="$(tc-getRANLIB)" \
- "$@" || die
+src_configure() {
+ tc-export AR CC LD RANLIB
+ export MAKESYSPATH="${BROOT}"/usr/share/mk/bmake
}
src_compile() {
- export MAKESYSPATH="${BROOT}"/usr/share/mk/bmake
- _bmake
+ bmake || die
}
src_install() {
- _bmake \
+ bmake \
DESTDIR="${D}" \
- BINDIR="${EPREFIX}"/usr/${CHOST}-elftoolchain/usr/bin \
+ BINDIR="${EPREFIX}"/usr/bin/${CHOST}-elftoolchain \
LIBDIR="${EPREFIX}"/usr/$(get_libdir) \
DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
- install
+ install || die
# remove static libraries
find "${ED}" -name '*.a' -delete || die