pesa 14/10/24 21:11:06 Modified: qbs-1.3.2.ebuild ChangeLog Log: Disable mprotect on several binaries wrt bug #526664. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.2 dev-util/qbs/qbs-1.3.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild?r1=1.1&r2=1.2 Index: qbs-1.3.2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qbs-1.3.2.ebuild 24 Oct 2014 18:07:23 -0000 1.1 +++ qbs-1.3.2.ebuild 24 Oct 2014 21:11:06 -0000 1.2 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild,v 1.1 2014/10/24 18:07:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.3.2.ebuild,v 1.2 2014/10/24 21:11:06 pesa Exp $ EAPI=5 -inherit multilib qmake-utils +inherit multilib pax-utils qmake-utils DESCRIPTION="Qt Build Suite" HOMEPAGE="http://qt-project.org/wiki/qbs"; @@ -68,18 +68,29 @@ fi } +src_compile() { + default + + # disable mprotect wrt bug 526664 + pax-mark m "${S}"/bin/qbs{,-config,-config-ui} +} + src_test() { + # disable mprotect wrt bug 526664 + pax-mark m "${S}"/bin/tst_* + + einfo "Setting up test environment in ${T}" + export HOME=${T} export LD_LIBRARY_PATH=${S}/$(get_libdir) local qmakepath=${EROOT}usr/$(get_libdir)/$(usev qt4 || usev qt5)/bin/qmake [[ -x ${qmakepath} ]] || qmakepath=${EROOT}usr/bin/qmake - einfo "Setting up test environment in ${T}" - "${S}"/bin/qbs-setup-toolchains --detect || die "${S}"/bin/qbs-setup-qt "${qmakepath}" qbs_autotests || die + einfo "Running autotests" default } @@ -89,8 +100,8 @@ # install documentation if use doc; then emake docs + dodoc -r doc/html dodoc doc/qbs.qch docompress -x /usr/share/doc/${PF}/qbs.qch - dohtml -r doc/html/* fi } 1.8 dev-util/qbs/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/qbs/ChangeLog?r1=1.7&r2=1.8 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 24 Oct 2014 18:07:23 -0000 1.7 +++ ChangeLog 24 Oct 2014 21:11:06 -0000 1.8 @@ -1,6 +1,9 @@ # ChangeLog for dev-util/qbs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.7 2014/10/24 18:07:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.8 2014/10/24 21:11:06 pesa Exp $ + + 24 Oct 2014; Davide Pesavento <p...@gentoo.org> qbs-1.3.2.ebuild: + Disable mprotect on several binaries wrt bug #526664. *qbs-1.3.2 (24 Oct 2014)
