vapier 15/07/13 08:24:46 Modified: sdcc-3.5.0.ebuild sdcc-9999.ebuild ChangeLog Log: Fix handling of AR/AS tools. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.8 dev-embedded/sdcc/sdcc-3.5.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild?r1=1.7&r2=1.8 Index: sdcc-3.5.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-3.5.0.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sdcc-3.5.0.ebuild 13 Jul 2015 08:01:30 -0000 1.7 +++ sdcc-3.5.0.ebuild 13 Jul 2015 08:24:46 -0000 1.8 @@ -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 @@ -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) \ 1.7 dev-embedded/sdcc/sdcc-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild?r1=1.6&r2=1.7 Index: sdcc-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/sdcc-9999.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sdcc-9999.ebuild 13 Jul 2015 08:01:30 -0000 1.6 +++ sdcc-9999.ebuild 13 Jul 2015 08:24:46 -0000 1.7 @@ -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 @@ -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_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) 1.56 dev-embedded/sdcc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/ChangeLog?rev=1.56&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/ChangeLog?rev=1.56&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/sdcc/ChangeLog?r1=1.55&r2=1.56 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-embedded/sdcc/ChangeLog,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ChangeLog 13 Jul 2015 08:01:30 -0000 1.55 +++ ChangeLog 13 Jul 2015 08:24:46 -0000 1.56 @@ -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 <[email protected]> sdcc-3.5.0.ebuild, + sdcc-9999.ebuild: + Fix handling of AR/AS tools. 13 Jul 2015; Mike Frysinger <[email protected]> sdcc-3.5.0.ebuild, sdcc-9999.ebuild:
