* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, eclass/
@ 2014-06-03 15:05 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2014-06-03 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 7651be23a9d3c0d0b230001c727b882a9039bbaa
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 3 15:04:19 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jun 3 15:04:19 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7651be23
[dev-qt/qtcore:4] Move mkspecs and qmake installation to eclass.
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 2 --
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 2 --
eclass/qt4-build-multilib.eclass | 6 ++++++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index 783bbdb..c446934 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -86,8 +86,6 @@ src_configure() {
src_install() {
qt4-build-multilib_src_install
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index 783bbdb..c446934 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -86,8 +86,6 @@ src_configure() {
src_install() {
qt4-build-multilib_src_install
- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
-
# List all the multilib libdirs
local libdirs=
for libdir in $(get_all_libdirs); do
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 86285af..5511995 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -396,12 +396,18 @@ multilib_src_install() {
qt4_foreach_target_subdir emake INSTALL_ROOT="${D}" install
+ if [[ ${PN} == qtcore ]]; then
+ einfo "Running emake INSTALL_ROOT=${D} install_{mkspecs,qmake}"
+ emake INSTALL_ROOT="${D}" install_{mkspecs,qmake}
+ fi
+
# install private headers of a few modules
if has ${PN} qtcore qtdeclarative qtgui qtscript; then
local moduledir=${PN#qt}
local modulename=Qt$(tr 'a-z' 'A-Z' <<< ${moduledir:0:1})${moduledir:1}
[[ ${moduledir} == core ]] && moduledir=corelib
+ einfo "Installing private headers into ${QT4_HEADERDIR}/${modulename}/private"
insinto "${QT4_HEADERDIR#${EPREFIX}}"/${modulename}/private
find "${S}"/src/${moduledir} -type f -name '*_p.h' -exec doins '{}' + || die
fi
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, eclass/
@ 2014-11-10 3:38 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2014-11-10 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 148c409cf4462865ce3d496b79ac09b5dfeb14ac
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 03:37:15 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 03:37:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=148c409c
[dev-qt/qtcore:4] Move and simplify env.d file installation to eclass.
---
dev-qt/qtcore/qtcore-4.8.6.ebuild | 11 -----------
dev-qt/qtcore/qtcore-4.8.9999.ebuild | 11 -----------
eclass/qt4-build-multilib.eclass | 6 ++++++
3 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-4.8.6.ebuild b/dev-qt/qtcore/qtcore-4.8.6.ebuild
index af8ef25..e06581e 100644
--- a/dev-qt/qtcore/qtcore-4.8.6.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.6.ebuild
@@ -93,17 +93,6 @@ multilib_src_configure() {
multilib_src_install_all() {
qt4_multilib_src_install_all
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}"/44qt4
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}"/44qt4
-
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
}
diff --git a/dev-qt/qtcore/qtcore-4.8.9999.ebuild b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
index af8ef25..e06581e 100644
--- a/dev-qt/qtcore/qtcore-4.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.9999.ebuild
@@ -93,17 +93,6 @@ multilib_src_configure() {
multilib_src_install_all() {
qt4_multilib_src_install_all
- # List all the multilib libdirs
- local libdirs=
- for libdir in $(get_all_libdirs); do
- libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
- done
-
- cat <<-EOF > "${T}"/44qt4
- LDPATH="${libdirs:1}"
- EOF
- doenvd "${T}"/44qt4
-
dodir "${QT4_DATADIR#${EPREFIX}}"/mkspecs/gentoo
mv "${D}${QT4_DATADIR}"/mkspecs/{qconfig.pri,gentoo/} || die
}
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index eae348f..441371b 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -413,6 +413,12 @@ qt4_multilib_src_install() {
einfo "Running $*"
"$@"
+ # install env.d file
+ cat > "${T}/44qt4-${CHOST}" <<-_EOF_
+ LDPATH="${QT4_LIBDIR}"
+ _EOF_
+ doenvd "${T}/44qt4-${CHOST}"
+
# install qtchooser configuration file
cat > "${T}/qt4-${CHOST}.conf" <<-_EOF_
${QT4_BINDIR}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, eclass/
@ 2017-03-15 0:34 Davide Pesavento
0 siblings, 0 replies; 3+ messages in thread
From: Davide Pesavento @ 2017-03-15 0:34 UTC (permalink / raw
To: gentoo-commits
commit: b9c3b54ae7058423ab3b545a468ff669bff5aad8
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 15 00:23:12 2017 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Mar 15 00:23:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=b9c3b54a
dev-qt/qtcore: cleanup iconv handling
Package-Manager: Portage-2.3.4, Repoman-2.3.2
dev-qt/qtcore/qtcore-5.8.0.ebuild | 3 ++-
dev-qt/qtcore/qtcore-5.8.9999.ebuild | 3 ++-
dev-qt/qtcore/qtcore-5.9999.ebuild | 3 ++-
eclass/qt5-build.eclass | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtcore/qtcore-5.8.0.ebuild b/dev-qt/qtcore/qtcore-5.8.0.ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.8.0.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.0.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
-system-doubleconversion
- $(usex icu '-icu -no-iconv' '-iconv -no-icu')
+ $(qt_use icu)
+ $(qt_use !icu iconv)
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.8.9999.ebuild b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.8.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.8.9999.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
-system-doubleconversion
- $(usex icu '-icu -no-iconv' '-iconv -no-icu')
+ $(qt_use icu)
+ $(qt_use !icu iconv)
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild
index 208ca66e..1c5b1eb7 100644
--- a/dev-qt/qtcore/qtcore-5.9999.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9999.ebuild
@@ -36,7 +36,8 @@ QT5_TARGET_SUBDIRS=(
src_configure() {
local myconf=(
-system-doubleconversion
- $(usex icu '-icu -no-iconv' '-iconv -no-icu')
+ $(qt_use icu)
+ $(qt_use !icu iconv)
$(qt_use systemd journald)
)
qt5-build_src_configure
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index dc70b831..97659d23 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -627,7 +627,8 @@ qt5_base_configure() {
-verbose
# always enable iconv support
- -iconv
+ # since 5.8 this is handled in qtcore
+ $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv)
# disable everything to prevent automagic deps (part 3)
-no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-15 0:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-10 3:38 [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/, eclass/ Davide Pesavento
-- strict thread matches above, loose matches on Subject: below --
2017-03-15 0:34 Davide Pesavento
2014-06-03 15:05 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox