mgorny 14/11/16 21:25:10 Modified: dbus-1.8.10.ebuild ChangeLog Log: Fake expat check for configure, bug #529546. Add missing ||die calls. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.6 sys-apps/dbus/dbus-1.8.10.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild?r1=1.5&r2=1.6 Index: dbus-1.8.10.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dbus-1.8.10.ebuild 14 Nov 2014 21:28:01 -0000 1.5 +++ dbus-1.8.10.ebuild 16 Nov 2014 21:25:10 -0000 1.6 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild,v 1.5 2014/11/14 21:28:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild,v 1.6 2014/11/16 21:25:10 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -131,6 +131,10 @@ --disable-libaudit --disable-systemd --without-x + + # expat is used for the daemon only + # fake the check for multilib library build + ac_cv_lib_expat_XML_ParserCreate_MM=yes ) fi @@ -138,8 +142,8 @@ ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}" if multilib_is_native_abi && use test; then - mkdir "${TBD}" - cd "${TBD}" + mkdir "${TBD}" || die + cd "${TBD}" || die einfo "Running configure in ${TBD}" ECONF_SOURCE="${S}" econf "${myconf[@]}" \ $(use_enable test asserts) \ @@ -158,10 +162,9 @@ einfo "Running make in ${BUILD_DIR}" emake - if multilib_is_native_abi && use test; then - cd "${TBD}" + if use test; then einfo "Running make in ${TBD}" - emake + emake -C "${TBD}" fi else emake -C dbus libdbus-1.la @@ -169,8 +172,7 @@ } src_test() { - cd "${TBD}" - DBUS_VERBOSE=1 Xemake -j1 check + DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check } multilib_src_install() { 1.456 sys-apps/dbus/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.456&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?rev=1.456&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/dbus/ChangeLog?r1=1.455&r2=1.456 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v retrieving revision 1.455 retrieving revision 1.456 diff -u -r1.455 -r1.456 --- ChangeLog 14 Nov 2014 21:28:01 -0000 1.455 +++ ChangeLog 16 Nov 2014 21:25:10 -0000 1.456 @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/dbus # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.455 2014/11/14 21:28:01 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.456 2014/11/16 21:25:10 mgorny Exp $ + + 16 Nov 2014; Michał Górny <[email protected]> dbus-1.8.10.ebuild: + Fake expat check for configure, bug #529546. Add missing ||die calls. 14 Nov 2014; Markus Meier <[email protected]> dbus-1.8.10.ebuild: arm stable, bug #528900
