diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-07-13 08:24:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-07-13 08:24:46 +0000 |
| commit | 3b6a8b3ecfc260128fbebcab9e7e348db8c7d7c7 (patch) | |
| tree | 935f5826b6e00ea639c5861c67276faa93e500ba /dev-embedded | |
| parent | Disable explicit ccache handling as portage already does this for us. (diff) | |
| download | gentoo-2-3b6a8b3ecfc260128fbebcab9e7e348db8c7d7c7.tar.gz gentoo-2-3b6a8b3ecfc260128fbebcab9e7e348db8c7d7c7.tar.bz2 gentoo-2-3b6a8b3ecfc260128fbebcab9e7e348db8c7d7c7.zip | |
Fix handling of AR/AS tools.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/sdcc/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-embedded/sdcc/sdcc-3.5.0.ebuild | 12 | ||||
| -rw-r--r-- | dev-embedded/sdcc/sdcc-9999.ebuild | 14 |
3 files changed, 26 insertions, 6 deletions
diff --git a/dev-embedded/sdcc/ChangeLog b/dev-embedded/sdcc/ChangeLog index 595d9c6b63c0..3d6326443554 100644 --- a/dev-embedded/sdcc/ChangeLog +++ b/dev-embedded/sdcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-embedded/sdcc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.55 2015/07/13 08:01:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v 1.56 2015/07/13 08:24:46 vapier Exp $ + + 13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild, + sdcc-9999.ebuild: + Fix handling of AR/AS tools. 13 Jul 2015; Mike Frysinger <vapier@gentoo.org> sdcc-3.5.0.ebuild, sdcc-9999.ebuild: diff --git a/dev-embedded/sdcc/sdcc-3.5.0.ebuild b/dev-embedded/sdcc/sdcc-3.5.0.ebuild index b2ea5d8a5a83..3c4c9fbc754a 100644 --- a/dev-embedded/sdcc/sdcc-3.5.0.ebuild +++ b/dev-embedded/sdcc/sdcc-3.5.0.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.7 2015/07/13 08:01:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v 1.8 2015/07/13 08:24:46 vapier Exp $ EAPI="5" -inherit eutils +inherit eutils toolchain-funcs if [[ ${PV} == "9999" ]] ; then ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc" @@ -61,12 +61,20 @@ src_prepare() { -e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \ {} + || die + # https://sourceforge.net/p/sdcc/bugs/2398/ + sed -i '1iAR = @AR@' Makefile.common.in || die + sed -i \ + -e "/^AR =/s:=.*:=$(tc-getAR):" \ + support/cpp/Makefile.in || die + # Make sure timestamps don't get messed up. [[ ${PV} == "9999" ]] && find "${S}" -type f -exec touch -r . {} + } src_configure() { econf \ + ac_cv_prog_AS="$(tc-getAS)" \ + ac_cv_prog_AR="$(tc-getAR)" \ --docdir='$(datarootdir)'/doc/${PF} \ --without-ccache \ $(use_enable mcs51 mcs51-port) \ diff --git a/dev-embedded/sdcc/sdcc-9999.ebuild b/dev-embedded/sdcc/sdcc-9999.ebuild index 9a323b87854e..8e724857ef91 100644 --- a/dev-embedded/sdcc/sdcc-9999.ebuild +++ b/dev-embedded/sdcc/sdcc-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.6 2015/07/13 08:01:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v 1.7 2015/07/13 08:24:46 vapier Exp $ EAPI="5" -inherit eutils +inherit eutils toolchain-funcs if [[ ${PV} == "9999" ]] ; then ESVN_REPO_URI="https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc" @@ -49,6 +49,12 @@ src_prepare() { -e 's:\<(PORTDIR|ARCH)\>:SDCC\1:g' \ {} + || die + # https://sourceforge.net/p/sdcc/bugs/2398/ + sed -i '1iAR = @AR@' Makefile.common.in || die + sed -i \ + -e "/^AR =/s:=.*:=$(tc-getAR):" \ + support/cpp/Makefile.in || die + # We'll install doc manually sed -i -e '/SDCC_DOC/d' Makefile.in || die sed -i -e 's/ doc//' sim/ucsim/packages_in.mk || die @@ -61,8 +67,10 @@ src_prepare() { } src_configure() { - ac_cv_prog_STRIP=true \ econf \ + ac_cv_prog_STRIP=true \ + ac_cv_prog_AS="$(tc-getAS)" \ + ac_cv_prog_AR="$(tc-getAR)" \ --without-ccache \ $(use_enable boehm-gc libgc) \ $(docs_compile && use_enable doc || echo --disable-doc) |