diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-05-04 19:50:14 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-05-04 19:50:14 +0000 |
| commit | cf18ae387d262701c850f4a46a8b6a9dce11c382 (patch) | |
| tree | 64fad953ee6fba1af5a123204e76a4558a0420ea /dev-qt/qt-creator | |
| parent | Make USE_PHP a REQUIRED variable for the php-ext-source-r2 eclass (diff) | |
| download | gentoo-2-cf18ae387d262701c850f4a46a8b6a9dce11c382.tar.gz gentoo-2-cf18ae387d262701c850f4a46a8b6a9dce11c382.tar.bz2 gentoo-2-cf18ae387d262701c850f4a46a8b6a9dce11c382.zip | |
More fixes for building the qbs plugin (bug 548086).
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Diffstat (limited to 'dev-qt/qt-creator')
| -rw-r--r-- | dev-qt/qt-creator/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-qt/qt-creator/qt-creator-3.4.0.ebuild | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/dev-qt/qt-creator/ChangeLog b/dev-qt/qt-creator/ChangeLog index 5e4cb6436346..f6236f718ef2 100644 --- a/dev-qt/qt-creator/ChangeLog +++ b/dev-qt/qt-creator/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-qt/qt-creator # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.50 2015/05/04 00:09:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/ChangeLog,v 1.51 2015/05/04 19:50:14 pesa Exp $ + + 04 May 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.4.0.ebuild: + More fixes for building the qbs plugin (bug 548086). 04 May 2015; Davide Pesavento <pesa@gentoo.org> qt-creator-3.2.2.ebuild, qt-creator-3.4.0.ebuild: diff --git a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild index e0c5eba70216..378d31896467 100644 --- a/dev-qt/qt-creator/qt-creator-3.4.0.ebuild +++ b/dev-qt/qt-creator/qt-creator-3.4.0.ebuild @@ -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/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.3 2015/05/04 00:09:31 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.4.0.ebuild,v 1.4 2015/05/04 19:50:14 pesa Exp $ EAPI=5 @@ -57,7 +57,7 @@ RDEPEND=" >=dev-qt/qtxml-${QT_PV} >=sys-devel/gdb-7.5[client,python] clang? ( >=sys-devel/clang-3.2:= ) - qbs? ( >=dev-util/qbs-1.4.0 ) + qbs? ( >=dev-util/qbs-1.4.0-r1 ) systemd? ( sys-apps/systemd:= ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) " @@ -119,6 +119,8 @@ src_configure() { IDE_PACKAGE_MODE=1 \ LLVM_INSTALL_DIR="${EPREFIX}/usr" \ QBS_INSTALL_DIR="${EPREFIX}/usr" \ + CONFIG+=qbs_disable_rpath \ + CONFIG+=qbs_enable_project_file_updates \ $(use systemd && echo CONFIG+=journald) \ $(use test && echo BUILD_TESTS=1) \ USE_SYSTEM_BOTAN=1 |