vapier 15/02/16 11:48:45 Modified: iojs-1.2.0.ebuild ChangeLog Log: Clean up src_configure: use proper arrays to hold flags, and use $ARCH rather than $CHOST matching to look up the target arch. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.5 net-libs/iojs/iojs-1.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild?r1=1.4&r2=1.5 Index: iojs-1.2.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iojs-1.2.0.ebuild 16 Feb 2015 11:28:47 -0000 1.4 +++ iojs-1.2.0.ebuild 16 Feb 2015 11:48:45 -0000 1.5 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v 1.4 2015/02/16 11:28:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/iojs-1.2.0.ebuild,v 1.5 2015/02/16 11:48:45 vapier Exp $ EAPI=5 @@ -62,43 +62,40 @@ # It doesn't really belong upstream , so it'll just be removed until someone # with more gentoo-knowledge than me (jbergstroem) figures it out. rm test/parallel/test-stdout-close-unref.js +} +src_configure() { tc-export CC CXX PKG_CONFIG export V=1 -} -src_configure() { - local myconf="" + local myconf=() local myarch="" - ! use npm && myconf="--without-npm" - use icu && myconf+=" --with-intl=system-icu" - use snapshot && myconf+=" --with-snapshot" - - case ${CHOST} in - i?86-*) - myarch="ia32" - ;; - x86_64-*) - if [[ $ABI = x86 ]]; then - myarch="ia32" - elif [[ $ABI = x32 ]]; then - myarch="x32" - else - myarch="x64" - fi ;; - arm*-*) - myarch="arm" - ;; - *) die "Unrecognized CHOST: ${CHOST}" + ! use npm && myconf+=( --without-npm ) + use icu && myconf+=( --with-intl=system-icu ) + use snapshot && myconf+=( --with-snapshot ) + + case ${ARCH} in + x86) myarch="ia32";; + amd64) + case ${ABI} in + x86) myarch="ia32";; + x32) myarch="x32";; + *) myarch="x64";; + esac + ;; + arm) myarch="arm";; + *) die "Unrecognized ARCH ${ARCH}";; esac - "${PYTHON}" configure --prefix="${EPREFIX}"/usr \ + "${PYTHON}" configure \ + --prefix="${EPREFIX}"/usr \ --shared-openssl \ --shared-libuv \ --shared-http-parser \ --shared-zlib \ --dest-cpu=${myarch} \ - --without-dtrace ${myconf} || die + --without-dtrace \ + "${myconf[@]}" || die } src_install() { 1.8 net-libs/iojs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/ChangeLog?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/ChangeLog?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/iojs/ChangeLog?r1=1.7&r2=1.8 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 16 Feb 2015 11:28:47 -0000 1.7 +++ ChangeLog 16 Feb 2015 11:48:45 -0000 1.8 @@ -1,6 +1,10 @@ # ChangeLog for net-libs/iojs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.7 2015/02/16 11:28:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/iojs/ChangeLog,v 1.8 2015/02/16 11:48:45 vapier Exp $ + + 16 Feb 2015; Mike Frysinger <[email protected]> iojs-1.2.0.ebuild: + Clean up src_configure: use proper arrays to hold flags, and use $ARCH rather + than $CHOST matching to look up the target arch. 16 Feb 2015; Mike Frysinger <[email protected]> +files/iojs-1.2.0-pkgconfig.patch, iojs-1.2.0.ebuild:
