diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2015-08-24 21:27:27 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2015-08-24 21:27:27 +0200 |
| commit | 2a78d6eaf28a7ad6b0e17e756c8dc94c429bce69 (patch) | |
| tree | d77448f93a371edc96aebc1ead98e44cead7fed4 /dev-qt | |
| parent | Merge git+ssh://git.gentoo.org/proj/qt (diff) | |
| download | qt-2a78d6eaf28a7ad6b0e17e756c8dc94c429bce69.tar.gz qt-2a78d6eaf28a7ad6b0e17e756c8dc94c429bce69.tar.bz2 qt-2a78d6eaf28a7ad6b0e17e756c8dc94c429bce69.zip | |
dev-qt/qt{declarative,script}: sync with gentoo.git wrt USE=jit
Signed-off-by: Davide Pesavento <pesa@gentoo.org>
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtscript/qtscript-5.5.0.ebuild | 9 | ||||
| -rw-r--r-- | dev-qt/qtscript/qtscript-5.5.9999.ebuild | 9 | ||||
| -rw-r--r-- | dev-qt/qtscript/qtscript-5.9999.ebuild | 9 |
6 files changed, 33 insertions, 6 deletions
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild index 70af74e3..6e560db0 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -IUSE="gles2 localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" @@ -26,6 +26,8 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch + use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild index 70af74e3..6e560db0 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -IUSE="gles2 localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" @@ -26,6 +26,8 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch + use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild index 70af74e3..6e560db0 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -IUSE="gles2 localstorage +widgets xml" +IUSE="gles2 +jit localstorage +widgets xml" # qtgui[gles2=] is needed because of bug 504322 DEPEND=" @@ -26,6 +26,8 @@ DEPEND=" RDEPEND="${DEPEND}" src_prepare() { + use jit || epatch "${FILESDIR}"/${PN}-5.4.2-disable-jit.patch + use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die diff --git a/dev-qt/qtscript/qtscript-5.5.0.ebuild b/dev-qt/qtscript/qtscript-5.5.0.ebuild index 3912f2ff..2eadc8c8 100644 --- a/dev-qt/qtscript/qtscript-5.5.0.ebuild +++ b/dev-qt/qtscript/qtscript-5.5.0.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -IUSE="scripttools" +IUSE="+jit scripttools" DEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -28,3 +28,10 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + $(usex jit '' JAVASCRIPTCORE_JIT=no) + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtscript/qtscript-5.5.9999.ebuild b/dev-qt/qtscript/qtscript-5.5.9999.ebuild index 3912f2ff..2eadc8c8 100644 --- a/dev-qt/qtscript/qtscript-5.5.9999.ebuild +++ b/dev-qt/qtscript/qtscript-5.5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -IUSE="scripttools" +IUSE="+jit scripttools" DEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -28,3 +28,10 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + $(usex jit '' JAVASCRIPTCORE_JIT=no) + ) + qt5-build_src_configure +} diff --git a/dev-qt/qtscript/qtscript-5.9999.ebuild b/dev-qt/qtscript/qtscript-5.9999.ebuild index 3912f2ff..2eadc8c8 100644 --- a/dev-qt/qtscript/qtscript-5.9999.ebuild +++ b/dev-qt/qtscript/qtscript-5.9999.ebuild @@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" fi -IUSE="scripttools" +IUSE="+jit scripttools" DEPEND=" >=dev-qt/qtcore-${PV}:5 @@ -28,3 +28,10 @@ src_prepare() { qt5-build_src_prepare } + +src_configure() { + local myqmakeargs=( + $(usex jit '' JAVASCRIPTCORE_JIT=no) + ) + qt5-build_src_configure +} |