commit: 513da9e913e15fbff05de1b80f5457fe0edd3a29
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Apr 3 12:30:41 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 12:30:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=513da9e9
sys-devel/elftoolchain: Simplify bmake calls, change BINDIR
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...0.7.1-r1.ebuild => elftoolchain-0.7.1-r2.ebuild} | 21 ++++++++-------------
1 file 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
similarity index 82%
rename from sys-devel/elftoolchain/elftoolchain-0.7.1-r1.ebuild
rename to sys-devel/elftoolchain/elftoolchain-0.7.1-r2.ebuild
index f5ede11619d..4eea87b1c58 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
