diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2014-10-24 21:11:06 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2014-10-24 21:11:06 +0000 |
| commit | d5aa25e705d0d2948b40ff56e919026e92657811 (patch) | |
| tree | a6278e1b66ce06a92eddfe98bf1efea02757c3f2 /dev-util/qbs | |
| parent | sci-physics/lammps: Removing old versions. (diff) | |
| download | gentoo-2-d5aa25e705d0d2948b40ff56e919026e92657811.tar.gz gentoo-2-d5aa25e705d0d2948b40ff56e919026e92657811.tar.bz2 gentoo-2-d5aa25e705d0d2948b40ff56e919026e92657811.zip | |
Disable mprotect on several binaries wrt bug #526664.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-util/qbs')
| -rw-r--r-- | dev-util/qbs/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-1.3.2.ebuild | 21 |
2 files changed, 20 insertions, 6 deletions
diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog index 8d8b04fb53bc..fa960ec624b1 100644 --- a/dev-util/qbs/ChangeLog +++ b/dev-util/qbs/ChangeLog @@ -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 <pesa@gentoo.org> qbs-1.3.2.ebuild: + Disable mprotect on several binaries wrt bug #526664. *qbs-1.3.2 (24 Oct 2014) diff --git a/dev-util/qbs/qbs-1.3.2.ebuild b/dev-util/qbs/qbs-1.3.2.ebuild index b7fe526ec518..80328d9cbb0e 100644 --- a/dev-util/qbs/qbs-1.3.2.ebuild +++ b/dev-util/qbs/qbs-1.3.2.ebuild @@ -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 @@ src_configure() { 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 @@ src_install() { # 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 } |