[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/16 17:49:13
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Drop QT4_VERBOSE_BUILD variable (always true now).
Revision ChangesPath
1.1667 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1667view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1667content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1666r2=1.1667
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -r1.1666 -r1.1667
--- ChangeLog 16 Jun 2015 17:47:24 - 1.1666
+++ ChangeLog 16 Jun 2015 17:49:13 - 1.1667
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1666 2015/06/16
17:47:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1667 2015/06/16
17:49:13 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Drop QT4_VERBOSE_BUILD variable (always true now).
16 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
Use use_if_iuse().
1.27 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.27view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.27content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.26r2=1.27
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4-build-multilib.eclass 13 Jun 2015 23:05:46 - 1.26
+++ qt4-build-multilib.eclass 16 Jun 2015 17:49:13 - 1.27
@@ -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/eclass/qt4-build-multilib.eclass,v 1.26
2015/06/13 23:05:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.27
2015/06/16 17:49:13 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -88,11 +88,6 @@
# Space-separated list of directories that will be configured,
# compiled, and installed. All paths must be relative to ${S}.
-# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
-# @DESCRIPTION:
-# Set to false to reduce build output during compilation.
-: ${QT4_VERBOSE_BUILD:=true}
-
# @ECLASS-VARIABLE: QCONFIG_ADD
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -381,8 +376,8 @@
# disable rpath on non-prefix (bugs 380415 and 417169)
$(usex prefix '' -no-rpath)
- # verbosity of the configure and build phases
- -verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
+ # print verbose information about each configure test
+ -verbose
# precompiled headers don't work on hardened, where the flag is
masked
$(in_iuse pch qt_use pch || echo -no-pch)
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/16 21:38:00
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Minor changes to reduce diff with qt5-build.eclass
Revision ChangesPath
1.1668 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1668view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1668content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1667r2=1.1668
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1667
retrieving revision 1.1668
diff -u -r1.1667 -r1.1668
--- ChangeLog 16 Jun 2015 17:49:13 - 1.1667
+++ ChangeLog 16 Jun 2015 21:38:00 - 1.1668
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1667 2015/06/16
17:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1668 2015/06/16
21:38:00 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Minor changes to reduce diff with qt5-build.eclass
16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Drop QT4_VERBOSE_BUILD variable (always true now).
1.28 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.28view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.28content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.27r2=1.28
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- qt4-build-multilib.eclass 16 Jun 2015 17:49:13 - 1.27
+++ qt4-build-multilib.eclass 16 Jun 2015 21:38:00 - 1.28
@@ -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/eclass/qt4-build-multilib.eclass,v 1.27
2015/06/16 17:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.28
2015/06/16 21:38:00 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -25,16 +25,12 @@
case ${PV} in
4.?.)
+ # git stable branch
QT4_BUILD_TYPE=live
- EGIT_REPO_URI=(
- git://code.qt.io/qt/qt.git
- https://code.qt.io/git/qt/qt.git;
- https://github.com/qtproject/qt.git;
- )
EGIT_BRANCH=${PV%.}
- inherit git-r3
;;
*)
+ # official stable release
QT4_BUILD_TYPE=release
MY_P=qt-everywhere-opensource-src-${PV/_/-}
SRC_URI=http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
@@ -42,6 +38,13 @@
;;
esac
+EGIT_REPO_URI=(
+ git://code.qt.io/qt/qt.git
+ https://code.qt.io/git/qt/qt.git;
+ https://github.com/qtproject/qt.git;
+)
+[[ ${QT4_BUILD_TYPE} == live ]] inherit git-r3
+
if [[ ${PN} != qttranslations ]]; then
IUSE=aqua debug pch
[[ ${PN} != qtxmlpatterns ]] IUSE+= +exceptions
@@ -507,21 +510,19 @@
find ${S}/src/${moduledir} -type f -name '*_p.h' -exec doins
'{}' + || die
fi
- # remove .la files since we are building only shared libraries
prune_libtool_files
}
# @FUNCTION: qt4-build-multilib_pkg_postinst
# @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
+# Regenerate configuration after installation or upgrade/downgrade.
qt4-build-multilib_pkg_postinst() {
qt4_regenerate_global_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
+# Regenerate configuration when a module is completely removed.
qt4-build-multilib_pkg_postrm() {
qt4_regenerate_global_qconfigs
}
@@ -590,16 +591,19 @@
# @DESCRIPTION:
# Executes the given command inside each directory listed in
QT4_TARGET_DIRECTORIES.
qt4_foreach_target_subdir() {
- local subdir
+ local ret=0 subdir=
for subdir in ${QT4_TARGET_DIRECTORIES}; do
mkdir -p ${subdir} || die
pushd ${subdir} /dev/null || die
einfo Running $* ${subdir:+in ${subdir}}
$@
+ ((ret+=$?))
popd /dev/null || die
done
+
+ return ${ret}
}
#
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 17:28:13
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
Revision ChangesPath
1.1659 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1658r2=1.1659
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- ChangeLog 13 Jun 2015 17:24:25 - 1.1658
+++ ChangeLog 13 Jun 2015 17:28:13 - 1.1659
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1658 2015/06/13
17:24:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1659 2015/06/13
17:28:13 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
13 Jun 2015; Alexandre Rostovtsev tetrom...@gentoo.org
-gnome-python-common.eclass:
1.23 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.22r2=1.23
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4-build-multilib.eclass 13 Jun 2015 16:10:09 - 1.22
+++ qt4-build-multilib.eclass 13 Jun 2015 17:28:13 - 1.23
@@ -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/eclass/qt4-build-multilib.eclass,v 1.22
2015/06/13 16:10:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.23
2015/06/13 17:28:13 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -171,9 +171,20 @@
fi
fi
+ if [[ ${PN} == qtdeclarative ]]; then
+ # Bug 551560
+ # gcc-4.8 ICE with -Os, fixed in 4.9
+ if use x86 [[ $(gcc-version) == 4.8 ]]; then
+ replace-flags -Os -O2
+ fi
+ fi
+
if [[ ${PN} == qtwebkit ]]; then
# Bug 550780
- filter-flags -fgraphite-identity -floop-strip-mine
+ # various ICEs with graphite-related flags, gcc-5 works
+ if [[ $(gcc-major-version) -lt 5 ]]; then
+ filter-flags -fgraphite-identity -floop-strip-mine
+ fi
fi
# Bug 261632
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 16:10:09
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Simplify move of .pc files.
Revision ChangesPath
1.1657 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1656r2=1.1657
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1656
retrieving revision 1.1657
diff -u -r1.1656 -r1.1657
--- ChangeLog 13 Jun 2015 00:35:35 - 1.1656
+++ ChangeLog 13 Jun 2015 16:10:09 - 1.1657
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1656 2015/06/13
00:35:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1657 2015/06/13
16:10:09 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Simplify move of .pc files.
13 Jun 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
mozconfig-v4.31.eclass:
1.22 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.21r2=1.22
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt4-build-multilib.eclass 12 Jun 2015 01:44:17 - 1.21
+++ qt4-build-multilib.eclass 13 Jun 2015 16:10:09 - 1.22
@@ -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/eclass/qt4-build-multilib.eclass,v 1.21
2015/06/12 01:44:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.22
2015/06/13 16:10:09 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -462,15 +462,10 @@
fi
fi
- # move pkgconfig files to the correct location
- eshopts_push -s nullglob
- local pcfile
- for pcfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
- dodir /usr/$(get_libdir)/pkgconfig
- mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
- done
- eshopts_pop
- rmdir ${D}/${QT4_LIBDIR}/pkgconfig
+ # move pkgconfig directory to the correct location
+ if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then
+ mv ${D}${QT4_LIBDIR}/pkgconfig ${ED}usr/$(get_libdir) || die
+ fi
qt4_install_module_qconfigs
qt4_symlink_framework_headers
@@ -754,7 +749,7 @@
dosym ${rdir}/${f}/Headers ${dest}
# Link normal headers as well.
- for hdr in ${D}/${QT4_LIBDIR}/${f}/Headers/*; do
+ for hdr in ${D}${QT4_LIBDIR}/${f}/Headers/*; do
h=$(basename ${hdr})
dosym ../${rdir}/${f}/Headers/${h} \
${QT4_HEADERDIR#${EPREFIX}}/Qt/${h}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 22:13:24
Modified: ChangeLog qt4-build-multilib.eclass
Log:
sh is supported, don't fallback to generic.
Also, don't die when tc-arch is unknown, the configure script can handle this
internally.
Revision ChangesPath
1.1661 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1660r2=1.1661
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1660
retrieving revision 1.1661
diff -u -r1.1660 -r1.1661
--- ChangeLog 13 Jun 2015 19:01:10 - 1.1660
+++ ChangeLog 13 Jun 2015 22:13:24 - 1.1661
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1660 2015/06/13
19:01:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13
22:13:24 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ sh is supported, don't fallback to generic. Also, don't die when tc-arch is
+ unknown, the configure script can handle this internally.
13 Jun 2015; Andreas K. Huettel dilfri...@gentoo.org perl-module.eclass:
Allow dev-perl/Module-Build in QA check for Module::Build
1.24 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.23r2=1.24
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qt4-build-multilib.eclass 13 Jun 2015 17:28:13 - 1.23
+++ qt4-build-multilib.eclass 13 Jun 2015 22:13:24 - 1.24
@@ -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/eclass/qt4-build-multilib.eclass,v 1.23
2015/06/13 17:28:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.24
2015/06/13 22:13:24 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -300,17 +300,15 @@
STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
- local arch=
- case $(tc-arch) in
- amd64|x64-*) arch=x86_64 ;;
- ppc*-macos) arch=ppc ;;
- ppc*) arch=powerpc ;;
- sparc*) arch=sparc ;;
- x86-macos)arch=x86 ;;
- x86*) arch=i386 ;;
- alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
- arm64|hppa|sh)arch=generic ;;
- *) die qt4-build-multilib.eclass: unsupported tc-arch
'$(tc-arch)' ;;
+ local arch=$(tc-arch)
+ case ${arch} in
+ amd64|x64-*)arch=x86_64 ;;
+ arm64|hppa) arch=generic ;;
+ ppc*-macos) arch=ppc ;;
+ ppc*) arch=powerpc ;;
+ sparc*) arch=sparc ;;
+ x86-macos) arch=x86 ;;
+ x86*) arch=i386 ;;
esac
# configure arguments
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 22:57:59
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Export MAKEFLAGS and OBJDUMP.
Revision ChangesPath
1.1662 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1662view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1662content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1661r2=1.1662
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -r1.1661 -r1.1662
--- ChangeLog 13 Jun 2015 22:13:24 - 1.1661
+++ ChangeLog 13 Jun 2015 22:57:59 - 1.1662
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13
22:13:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1662 2015/06/13
22:57:59 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Export MAKEFLAGS and OBJDUMP.
13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
sh is supported, don't fallback to generic. Also, don't die when tc-arch is
1.25 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.25view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.25content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.24r2=1.25
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qt4-build-multilib.eclass 13 Jun 2015 22:13:24 - 1.24
+++ qt4-build-multilib.eclass 13 Jun 2015 22:57:59 - 1.25
@@ -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/eclass/qt4-build-multilib.eclass,v 1.24
2015/06/13 22:13:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.25
2015/06/13 22:57:59 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -296,7 +296,9 @@
CC=$(tc-getCC) \
CXX=$(tc-getCXX) \
LD=$(tc-getCXX) \
+ MAKEFLAGS=${MAKEOPTS} \
OBJCOPY=$(tc-getOBJCOPY) \
+ OBJDUMP=$(tc-getOBJDUMP) \
STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/11 18:33:54
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Use usex().
Revision ChangesPath
1.1652 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1651r2=1.1652
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1651
retrieving revision 1.1652
diff -u -r1.1651 -r1.1652
--- ChangeLog 10 Jun 2015 18:08:02 - 1.1651
+++ ChangeLog 11 Jun 2015 18:33:54 - 1.1652
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10
18:08:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11
18:33:54 pesa Exp $
+
+ 11 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Use usex().
10 Jun 2015; grkni...@gentoo.org mysql-multilib.eclass:
Resolve cirucular dependency for bug 551686; Make USE=cluster die early for
1.20 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.19r2=1.20
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4-build-multilib.eclass 9 Jun 2015 21:12:50 - 1.19
+++ qt4-build-multilib.eclass 11 Jun 2015 18:33:54 - 1.20
@@ -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/eclass/qt4-build-multilib.eclass,v 1.19
2015/06/09 21:12:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20
2015/06/11 18:33:54 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -368,7 +368,7 @@
-nomake demos
# disable rpath on non-prefix (bugs 380415 and 417169)
- $(use prefix || echo -no-rpath)
+ $(usex prefix '' -no-rpath)
# verbosity of the configure and build phases
-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
@@ -531,22 +531,30 @@
# @FUNCTION: qt_use
# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
+# flag is the name of a flag in IUSE.
+#
# Outputs -${enableval}-${feature} if flag is enabled, -no-${feature}
# otherwise. If [feature] is not specified, flag is used in its place.
# If [enableval] is not specified, the -${enableval} prefix is omitted.
qt_use() {
- use $1 echo ${3:+-$3}-${2:-$1} || echo -no-${2:-$1}
+ [[ $# -ge 1 ]] || die ${FUNCNAME}() requires at least one argument
+
+ usex $1 ${3:+-$3}-${2:-$1} -no-${2:-$1}
}
# @FUNCTION: qt_native_use
# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
+# flag is the name of a flag in IUSE.
+#
# Outputs -${enableval}-${feature} if flag is enabled and we are currently
# building for the native ABI, -no-${feature} otherwise. If [feature] is not
# specified, flag is used in its place. If [enableval] is not specified,
# the -${enableval} prefix is omitted.
qt_native_use() {
- multilib_is_native_abi use $1 echo ${3:+-$3}-${2:-$1} || echo
-no-${2:-$1}
+ [[ $# -ge 1 ]] || die ${FUNCNAME}() requires at least one argument
+
+ multilib_is_native_abi qt_use $@ || echo -no-${2:-$1}
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/12 01:44:17
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Don't die when trying to rmdir non-existent directory (bug 551676).
Revision ChangesPath
1.1653 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1652r2=1.1653
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -r1.1652 -r1.1653
--- ChangeLog 11 Jun 2015 18:33:54 - 1.1652
+++ ChangeLog 12 Jun 2015 01:44:17 - 1.1653
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11
18:33:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1653 2015/06/12
01:44:17 pesa Exp $
+
+ 12 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Don't die when trying to rmdir non-existent directory (bug 551676).
11 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Use usex().
1.21 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.20r2=1.21
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4-build-multilib.eclass 11 Jun 2015 18:33:54 - 1.20
+++ qt4-build-multilib.eclass 12 Jun 2015 01:44:17 - 1.21
@@ -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/eclass/qt4-build-multilib.eclass,v 1.20
2015/06/11 18:33:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21
2015/06/12 01:44:17 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -470,7 +470,7 @@
mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
done
eshopts_pop
- rmdir ${D}/${QT4_LIBDIR}/pkgconfig || die
+ rmdir ${D}/${QT4_LIBDIR}/pkgconfig
qt4_install_module_qconfigs
qt4_symlink_framework_headers
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/09 18:13:42
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Remove two seds that are no longer needed on current Qt versions.
Revision ChangesPath
1.1646 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1645r2=1.1646
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1645
retrieving revision 1.1646
diff -u -r1.1645 -r1.1646
--- ChangeLog 9 Jun 2015 10:18:38 - 1.1645
+++ ChangeLog 9 Jun 2015 18:13:42 - 1.1646
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1645 2015/06/09
10:18:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1646 2015/06/09
18:13:42 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Remove two seds that are no longer needed on current Qt versions.
09 Jun 2015; Gilles Dartiguelongue e...@gentoo.org gnome2.eclass,
vala.eclass:
1.17 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.16r2=1.17
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4-build-multilib.eclass 31 May 2015 13:56:53 - 1.16
+++ qt4-build-multilib.eclass 9 Jun 2015 18:13:42 - 1.17
@@ -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/eclass/qt4-build-multilib.eclass,v 1.16
2015/05/31 13:56:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.17
2015/06/09 18:13:42 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -459,8 +459,15 @@
fi
fi
+ # move pkgconfig files to the correct directory
+ local pcfile
+ for pcfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
+ dodir /usr/$(get_libdir)/pkgconfig
+ mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
+ done
+ rmdir ${D}/${QT4_LIBDIR}/pkgconfig || die
+
install_qconfigs
- fix_library_files
fix_includes
}
@@ -547,7 +554,6 @@
QT4_PREFIX=${EPREFIX}/usr
QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
- QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig
QT4_BINDIR=${QT4_LIBDIR}/bin
QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
QT4_IMPORTDIR=${QT4_LIBDIR}/imports
@@ -699,34 +705,6 @@
fi
}
-# @FUNCTION: fix_library_files
-# @INTERNAL
-# @DESCRIPTION:
-# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
-# moves the *.pc files into the pkgconfig directory.
-fix_library_files() {
- local libfile
- for libfile in ${D}/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
- if [[ -e ${libfile} ]]; then
- sed -i -e s:${S}/lib:${QT4_LIBDIR}:g ${libfile} ||
die sed on ${libfile} failed
- fi
- done
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
- for libfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
- if [[ -e ${libfile} ]]; then
- sed -i -e s:${S}/bin:${QT4_BINDIR}:g ${libfile} ||
die sed on ${libfile} failed
-
- # Move .pc files into the pkgconfig directory
- dodir ${QT4_PCDIR#${EPREFIX}}
- mv ${libfile} ${D}/${QT4_PCDIR}/ || die moving ${libfile} to
${D}/${QT4_PCDIR}/ failed
- fi
- done
-
- # Don't install an empty directory
- rmdir ${D}/${QT4_LIBDIR}/pkgconfig
-}
-
# @FUNCTION: fix_includes
# @DESCRIPTION:
# For MacOS X we need to add some symlinks when frameworks are
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/09 21:12:51
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Rename some internal functions for consistency.
Revision ChangesPath
1.1649 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1649view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1649content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1648r2=1.1649
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1648
retrieving revision 1.1649
diff -u -r1.1648 -r1.1649
--- ChangeLog 9 Jun 2015 20:16:59 - 1.1648
+++ ChangeLog 9 Jun 2015 21:12:50 - 1.1649
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1648 2015/06/09
20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1649 2015/06/09
21:12:50 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Rename some internal functions for consistency.
09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass,
qt5-build.eclass:
1.19 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.19view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.19content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.18r2=1.19
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt4-build-multilib.eclass 9 Jun 2015 20:16:59 - 1.18
+++ qt4-build-multilib.eclass 9 Jun 2015 21:12:50 - 1.19
@@ -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/eclass/qt4-build-multilib.eclass,v 1.18
2015/06/09 20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.19
2015/06/09 21:12:50 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -108,6 +108,9 @@
# @DESCRIPTION:
# List of macros that must be defined in QtCore/qconfig.h
+
+## Phase functions ##
+
# @FUNCTION: qt4-build-multilib_src_unpack
# @DESCRIPTION:
# Unpacks the sources.
@@ -459,16 +462,18 @@
fi
fi
- # move pkgconfig files to the correct directory
+ # move pkgconfig files to the correct location
+ eshopts_push -s nullglob
local pcfile
for pcfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
dodir /usr/$(get_libdir)/pkgconfig
mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
done
+ eshopts_pop
rmdir ${D}/${QT4_LIBDIR}/pkgconfig || die
- install_qconfigs
- fix_includes
+ qt4_install_module_qconfigs
+ qt4_symlink_framework_headers
}
qt4_multilib_src_install_all() {
@@ -510,16 +515,19 @@
# Regenerate configuration, plus throw a message about possible
# breakages and proposed solutions.
qt4-build-multilib_pkg_postinst() {
- generate_qconfigs
+ qt4_regenerate_global_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
# Regenerate configuration when the package is completely removed.
qt4-build-multilib_pkg_postrm() {
- generate_qconfigs
+ qt4_regenerate_global_qconfigs
}
+
+## Public helpers ##
+
# @FUNCTION: qt_use
# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
@@ -622,11 +630,11 @@
|| die qmake failed (${projectdir})
}
-# @FUNCTION: install_qconfigs
+# @FUNCTION: qt4_install_module_qconfigs
# @INTERNAL
# @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
-install_qconfigs() {
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
+qt4_install_module_qconfigs() {
local x
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
for x in QCONFIG_ADD QCONFIG_REMOVE; do
@@ -645,11 +653,12 @@
fi
}
-# @FUNCTION: generate_qconfigs
+# @FUNCTION: qt4_regenerate_global_qconfigs
# @INTERNAL
# @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
+# Generates Gentoo-specific qconfig.{h,pri} according to the build
configuration.
+# Don't call die here because dying in pkg_post{inst,rm} only makes things
worse.
+qt4_regenerate_global_qconfigs() {
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE}
|| ${PN} == qtcore
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt5-build.eclass
pesa15/06/09 20:16:59
Modified: ChangeLog qt4-build-multilib.eclass
qt5-build.eclass
Log:
More accurate LICENSE.
Revision ChangesPath
1.1648 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1648view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1648content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1647r2=1.1648
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1647
retrieving revision 1.1648
diff -u -r1.1647 -r1.1648
--- ChangeLog 9 Jun 2015 19:37:45 - 1.1647
+++ ChangeLog 9 Jun 2015 20:16:59 - 1.1648
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1647 2015/06/09
19:37:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1648 2015/06/09
20:16:59 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass,
+ qt5-build.eclass:
+ More accurate LICENSE.
09 Jun 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
Delete redundant echo.
1.18 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.18view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.18content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.17r2=1.18
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qt4-build-multilib.eclass 9 Jun 2015 18:13:42 - 1.17
+++ qt4-build-multilib.eclass 9 Jun 2015 20:16:59 - 1.18
@@ -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/eclass/qt4-build-multilib.eclass,v 1.17
2015/06/09 18:13:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.18
2015/06/09 20:16:59 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -20,7 +20,7 @@
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
HOMEPAGE=https://www.qt.io/;
-LICENSE=|| ( LGPL-2.1 GPL-3 )
+LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
SLOT=4
case ${PV} in
1.19 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.19view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.19content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.18r2=1.19
Index: qt5-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt5-build.eclass9 Jun 2015 19:37:45 - 1.18
+++ qt5-build.eclass9 Jun 2015 20:16:59 - 1.19
@@ -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/eclass/qt5-build.eclass,v 1.18 2015/06/09
19:37:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.19 2015/06/09
20:16:59 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -23,7 +23,7 @@
QT5_MINOR_VERSION=${QT5_MINOR_VERSION%%.*}
HOMEPAGE=https://www.qt.io/;
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) FDL-1.3
SLOT=5
# @ECLASS-VARIABLE: QT5_MODULE
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/05/31 13:56:53
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780).
Revision ChangesPath
1.1633 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1633content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1632r2=1.1633
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1632
retrieving revision 1.1633
diff -u -r1.1632 -r1.1633
--- ChangeLog 31 May 2015 10:11:35 - 1.1632
+++ ChangeLog 31 May 2015 13:56:53 - 1.1633
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1632 2015/05/31
10:11:35 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1633 2015/05/31
13:56:53 pesa Exp $
+
+ 31 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Blacklist graphite-related flags that cause ICEs on qtwebkit (bug 550780).
31 May 2015; Jason Zaman perfin...@gentoo.org kde4-base.eclass,
kde5.eclass:
KDE: fix SELinux deps, bug 550824
1.16 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.16content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.15r2=1.16
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qt4-build-multilib.eclass 10 May 2015 14:27:29 - 1.15
+++ qt4-build-multilib.eclass 31 May 2015 13:56:53 - 1.16
@@ -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/eclass/qt4-build-multilib.eclass,v 1.15
2015/05/10 14:27:29 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.16
2015/05/31 13:56:53 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -154,20 +154,6 @@
|| die sed failed (skip X11 tests)
fi
- if use_if_iuse aqua; then
- sed -i \
- -e '/^CONFIG/s:app_bundle::' \
- -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname
absolute_library_soname:' \
- mkspecs/$(qt4_get_mkspec)/qmake.conf \
- || die sed failed (aqua)
-
- # we are crazy and build cocoa + qt3support
- if { ! in_iuse qt3support || use qt3support; } [[
${CHOST##*-darwin} -ge 9 ]]; then
- sed -i -e /case \\$PLATFORM,\$CFG_MAC_COCOA\
in/,/;;/ s|CFG_QT3SUPPORT=\no\|CFG_QT3SUPPORT=\yes\| \
- configure || die sed failed (cocoa +
qt3support)
- fi
- fi
-
if [[ ${PN} == qtcore ]]; then
# Bug 373061
# qmake bus errors with -O2 or -O3 but -O1 works
@@ -182,6 +168,11 @@
fi
fi
+ if [[ ${PN} == qtwebkit ]]; then
+ # Bug 550780
+ filter-flags -fgraphite-identity -floop-strip-mine
+ fi
+
# Bug 261632
if use ppc64; then
append-flags -mminimal-toc
@@ -220,6 +211,20 @@
mkspecs/$(qt4_get_mkspec)/qmake.conf \
|| die sed QMAKE_(LIB|INC)DIR failed
+ if use_if_iuse aqua; then
+ sed -i \
+ -e '/^CONFIG/s:app_bundle::' \
+ -e '/^CONFIG/s:plugin_no_soname:plugin_with_soname
absolute_library_soname:' \
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \
+ || die sed failed (aqua)
+
+ # we are crazy and build cocoa + qt3support
+ if { ! in_iuse qt3support || use qt3support; } [[
${CHOST##*-darwin} -ge 9 ]]; then
+ sed -i -e /case \\$PLATFORM,\$CFG_MAC_COCOA\
in/,/;;/ s|CFG_QT3SUPPORT=\no\|CFG_QT3SUPPORT=\yes\| \
+ configure || die sed failed (cocoa +
qt3support)
+ fi
+ fi
+
if [[ ${CHOST} == *-darwin* ]]; then
# Set FLAGS and remove -arch, since our gcc-apple is multilib
crippled (by design)
sed -i \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/05/10 01:06:49
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Delete obsolete code that is now causing problems on freebsd (bug 493310).
Revision ChangesPath
1.1611 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1611view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1611content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1610r2=1.1611
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1610
retrieving revision 1.1611
diff -u -r1.1610 -r1.1611
--- ChangeLog 9 May 2015 22:20:44 - 1.1610
+++ ChangeLog 10 May 2015 01:06:49 - 1.1611
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1610 2015/05/09
22:20:44 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1611 2015/05/10
01:06:49 pesa Exp $
+
+ 10 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Delete obsolete code that is now causing problems on freebsd (bug 493310).
09 May 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass,
java-virtuals-2.eclass, java-vm-2.eclass:
1.14 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.14view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.14content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.13r2=1.14
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qt4-build-multilib.eclass 9 May 2015 19:51:00 - 1.13
+++ qt4-build-multilib.eclass 10 May 2015 01:06:49 - 1.14
@@ -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/eclass/qt4-build-multilib.eclass,v 1.13
2015/05/09 19:51:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.14
2015/05/10 01:06:49 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -373,10 +373,6 @@
# mostly to be seen as a core dump with the message:
# QPixmap: Must construct a QApplication before a QPaintDevice
$([[ ${CHOST} != *-solaris* ]] echo -reduce-relocations)
-
- # this one is needed for all systems with a separate -liconv,
apart from
- # Darwin, for which the sources already cater for -liconv
- $(use !elibc_glibc [[ ${CHOST} != *-darwin* ]] echo
-liconv)
)
if use_if_iuse aqua; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/05/09 18:19:31
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Update from qt overlay: overhaul toolchain and *FLAGS handling for proper
multilib support during the configure phase. Fixes bug #545106.
Revision ChangesPath
1.1607 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1607view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1607content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1606r2=1.1607
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1606
retrieving revision 1.1607
diff -u -r1.1606 -r1.1607
--- ChangeLog 9 May 2015 15:33:21 - 1.1606
+++ ChangeLog 9 May 2015 18:19:31 - 1.1607
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1606 2015/05/09
15:33:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1607 2015/05/09
18:19:31 pesa Exp $
+
+ 09 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Update from qt overlay: overhaul toolchain and *FLAGS handling for proper
+ multilib support during the configure phase. Fixes bug #545106.
09 May 2015; Manuel Rüger mr...@gentoo.org kde5.eclass:
Sync with overlay.
1.11 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.11view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.11content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.10r2=1.11
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qt4-build-multilib.eclass 22 Apr 2015 20:23:47 - 1.10
+++ qt4-build-multilib.eclass 9 May 2015 18:19:31 - 1.11
@@ -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/eclass/qt4-build-multilib.eclass,v 1.10
2015/04/22 20:23:47 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.11
2015/05/09 18:19:31 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -208,12 +208,16 @@
QMakeVar set QMAKE_LFLAGS_DEBUG\n' \
configure || die sed QMAKE_*FLAGS_{RELEASE,DEBUG} failed
- # Respect CC, CXX, LINK and *FLAGS in config.tests
+ # Drop -nocache from qmake invocation in all configure tests, to ensure
that the
+ # correct toolchain and build flags are picked up from
config.tests/.qmake.cache
find config.tests/unix -name '*.test' -type f -print0 | xargs -0 \
- sed -i -e /bin\/qmake/ s: \\$SRCDIR/: \
- 'QMAKE_CC=$(tc-getCC)''QMAKE_CXX=$(tc-getCXX)'
'QMAKE_LINK=$(tc-getCXX)' \
- 'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}'
'QMAKE_LFLAGS+=${LDFLAGS}': \
- || die sed config.tests failed
+ sed -i -e '/bin\/qmake/s/ -nocache//' || die sed -nocache
failed
+
+ # compile.test needs additional patching so that it doesn't create
another cache file
+ # inside the test subdir, which would incorrectly override
config.tests/.qmake.cache
+ sed -i -e '/echo.*QT_BUILD_TREE.*\.qmake\.cache/d' \
+ -e '/bin\/qmake/s/ $SRCDIR/ QT_BUILD_TREE=$OUTDIR/' \
+ config.tests/unix/compile.test || die sed compile.test failed
# Delete references to the obsolete /usr/X11R6 directory
# On prefix, this also prevents looking at non-prefix stuff
@@ -339,6 +343,18 @@
-arch ${arch}
-platform $(qt4_get_mkspec)
+ # instruction set support
+ $(is-flagq -mno-mmx echo -no-mmx)
+ $(is-flagq -mno-3dnowecho -no-3dnow)
+ $(is-flagq -mno-sse echo -no-sse)
+ $(is-flagq -mno-sse2 echo -no-sse2)
+ $(is-flagq -mno-sse3 echo -no-sse3)
+ $(is-flagq -mno-ssse3echo -no-ssse3)
+ $(is-flagq -mno-sse4.1 echo -no-sse4.1)
+ $(is-flagq -mno-sse4.2 echo -no-sse4.2)
+ $(is-flagq -mno-avx echo -no-avx)
+ $(is-flagq -mfpu=* ! is-flagq -mfpu=*neon* echo
-no-neon)
+
# prefer system libraries
-system-zlib
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/05/09 19:48:37
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Move workaround for bug 367045 from qtgui ebuild to eclass.
Revision ChangesPath
1.1608 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1608view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1608content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1607r2=1.1608
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1607
retrieving revision 1.1608
diff -u -r1.1607 -r1.1608
--- ChangeLog 9 May 2015 18:19:31 - 1.1607
+++ ChangeLog 9 May 2015 19:48:37 - 1.1608
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1607 2015/05/09
18:19:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1608 2015/05/09
19:48:37 pesa Exp $
+
+ 09 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Move workaround for bug 367045 from qtgui ebuild to eclass.
09 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Update from qt overlay: overhaul toolchain and *FLAGS handling for proper
1.12 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.12view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.12content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.11r2=1.12
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qt4-build-multilib.eclass 9 May 2015 18:19:31 - 1.11
+++ qt4-build-multilib.eclass 9 May 2015 19:48:37 - 1.12
@@ -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/eclass/qt4-build-multilib.eclass,v 1.11
2015/05/09 18:19:31 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.12
2015/05/09 19:48:37 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -355,6 +355,9 @@
$(is-flagq -mno-avx echo -no-avx)
$(is-flagq -mfpu=* ! is-flagq -mfpu=*neon* echo
-no-neon)
+ # bug 367045
+ $([[ ${CHOST} == *86*-apple-darwin* ]] echo -no-ssse3)
+
# prefer system libraries
-system-zlib
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/05/09 19:51:00 Modified: ChangeLog qt4-build-multilib.eclass Log: graphite support was dropped from gcc-4.7 Revision ChangesPath 1.1609 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1609view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1609content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1608r2=1.1609 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1608 retrieving revision 1.1609 diff -u -r1.1608 -r1.1609 --- ChangeLog 9 May 2015 19:48:37 - 1.1608 +++ ChangeLog 9 May 2015 19:51:00 - 1.1609 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1608 2015/05/09 19:48:37 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1609 2015/05/09 19:51:00 pesa Exp $ + + 09 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass: + graphite support was dropped from gcc-4.7 09 May 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass: Move workaround for bug 367045 from qtgui ebuild to eclass. 1.13 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.13view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.13content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.12r2=1.13 Index: qt4-build-multilib.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- qt4-build-multilib.eclass 9 May 2015 19:48:37 - 1.12 +++ qt4-build-multilib.eclass 9 May 2015 19:51:00 - 1.13 @@ -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/eclass/qt4-build-multilib.eclass,v 1.12 2015/05/09 19:48:37 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.13 2015/05/09 19:51:00 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -187,12 +187,6 @@ append-flags -mminimal-toc fi - # Bug 417105 - # graphite on gcc 4.7 causes miscompilations - if [[ $(gcc-version) == 4.7 ]]; then - filter-flags -fgraphite-identity - fi - # Read also AR from the environment sed -i -e 's/^SYSTEM_VARIABLES=/AR /' \ configure || die sed SYSTEM_VARIABLES failed
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/04/22 20:23:47
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
Revision ChangesPath
1.1592 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1592view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1592content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1591r2=1.1592
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1591
retrieving revision 1.1592
diff -u -r1.1591 -r1.1592
--- ChangeLog 21 Apr 2015 11:19:10 - 1.1591
+++ ChangeLog 22 Apr 2015 20:23:47 - 1.1592
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1591 2015/04/21
11:19:10 perfinion Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1592 2015/04/22
20:23:47 pesa Exp $
+
+ 22 Apr 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Sync with qt overlay: cleanup prefix-related patching and fix bug #542780.
21 Apr 2015; Jason Zaman perfin...@gentoo.org selinux-policy-2.eclass:
update git urls and migrate git-2 - git-r3
1.10 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.10view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.10content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.9r2=1.10
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4-build-multilib.eclass 1 Apr 2015 18:45:04 - 1.9
+++ qt4-build-multilib.eclass 22 Apr 2015 20:23:47 - 1.10
@@ -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/eclass/qt4-build-multilib.eclass,v 1.9
2015/04/01 18:45:04 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.10
2015/04/22 20:23:47 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -198,7 +198,7 @@
configure || die sed SYSTEM_VARIABLES failed
# Reset QMAKE_*FLAGS_{RELEASE,DEBUG} variables,
- # or they will override user's flags (.qmake.cache)
+ # or they will override the user's flags (via .qmake.cache)
sed -i -e '/^SYSTEM_VARIABLES=/ i \
QMakeVar set QMAKE_CFLAGS_RELEASE\
QMakeVar set QMAKE_CFLAGS_DEBUG\
@@ -215,8 +215,12 @@
'QMAKE_CFLAGS+=${CFLAGS}' 'QMAKE_CXXFLAGS+=${CXXFLAGS}'
'QMAKE_LFLAGS+=${LDFLAGS}': \
|| die sed config.tests failed
- # Bug 172219
- sed -e 's:/X11R6/:/:' -i mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+ # Delete references to the obsolete /usr/X11R6 directory
+ # On prefix, this also prevents looking at non-prefix stuff
+ sed -i -re '/^QMAKE_(LIB|INC)DIR(_X11|_OPENGL|)\s+/ s/=.*/=/' \
+ mkspecs/common/linux.conf \
+ mkspecs/$(qt4_get_mkspec)/qmake.conf \
+ || die sed QMAKE_(LIB|INC)DIR failed
if [[ ${CHOST} == *-darwin* ]]; then
# Set FLAGS and remove -arch, since our gcc-apple is multilib
crippled (by design)
@@ -254,22 +258,10 @@
fi
fi
- # this is needed for all systems with a separate -liconv, except
- # Darwin, for which the sources already cater for -liconv
- if use !elibc_glibc [[ ${CHOST} != *-darwin* ]]; then
- sed -e 's|mac:\(LIBS += -liconv\)|\1|g' \
- -i config.tests/unix/iconv/iconv.pro \
- || die sed iconv.pro failed
- fi
-
- # we need some patches for Solaris
- sed -i -e '/^QMAKE_LFLAGS_THREAD/a\QMAKE_LFLAGS_DYNAMIC_LIST =
-Wl,--dynamic-list,' \
- mkspecs/$(qt4_get_mkspec)/qmake.conf || die
- # use GCC over SunStudio
- sed -i -e '/PLATFORM=solaris-cc/s/cc/g++/' configure || die
- # do not flirt with non-Prefix stuff, we're quite possessive
- sed -i -e '/^QMAKE_\(LIB\|INC\)DIR\(_X11\|_OPENGL\|\)\t/s/=.*$/=/' \
- mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+ if [[ ${CHOST} == *-solaris* ]]; then
+ sed -i -e '/^QMAKE_LFLAGS_THREAD/a QMAKE_LFLAGS_DYNAMIC_LIST =
-Wl,--dynamic-list,' \
+ mkspecs/$(qt4_get_mkspec)/qmake.conf || die
+ fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass qt5-build.eclass
pesa15/04/01 18:45:04
Modified: ChangeLog qt4-build-multilib.eclass
qt4-build.eclass qt5-build.eclass
Log:
Remove all references to qt-project.org and switch EGIT_REPO_URI from
gitorious to code.qt.io.
Revision ChangesPath
1.1581 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1581view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1581content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1580r2=1.1581
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1580
retrieving revision 1.1581
diff -u -r1.1580 -r1.1581
--- ChangeLog 31 Mar 2015 18:43:33 - 1.1580
+++ ChangeLog 1 Apr 2015 18:45:04 - 1.1581
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1580 2015/03/31
18:43:33 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1581 2015/04/01
18:45:04 pesa Exp $
+
+ 01 Apr 2015; Davide Pesavento p...@gentoo.org qt4-build.eclass,
+ qt4-build-multilib.eclass, qt5-build.eclass:
+ Remove all references to qt-project.org and switch EGIT_REPO_URI from
+ gitorious to code.qt.io.
31 Mar 2015; Ulrich Müller u...@gentoo.org java-vm-2.eclass,
vdr-plugin-2.eclass, gnat.eclass, gnatbuild.eclass, myspell.eclass,
1.9 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.9view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.9content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.8r2=1.9
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt4-build-multilib.eclass 23 Mar 2015 02:15:14 - 1.8
+++ qt4-build-multilib.eclass 1 Apr 2015 18:45:04 - 1.9
@@ -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/eclass/qt4-build-multilib.eclass,v 1.8
2015/03/23 02:15:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.9
2015/04/01 18:45:04 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -19,7 +19,7 @@
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
-HOMEPAGE=https://www.qt.io/ https://qt-project.org/;
+HOMEPAGE=https://www.qt.io/;
LICENSE=|| ( LGPL-2.1 GPL-3 )
SLOT=4
@@ -27,8 +27,9 @@
4.?.)
QT4_BUILD_TYPE=live
EGIT_REPO_URI=(
- git://gitorious.org/qt/qt.git
- https://git.gitorious.org/qt/qt.git;
+ git://code.qt.io/qt/qt.git
+ https://code.qt.io/git/qt/qt.git;
+ https://github.com/qtproject/qt.git;
)
EGIT_BRANCH=${PV%.}
inherit git-r3
1.163eclass/qt4-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.163view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.163content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.162r2=1.163
Index: qt4-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- qt4-build.eclass23 Mar 2015 02:15:14 - 1.162
+++ qt4-build.eclass1 Apr 2015 18:45:04 - 1.163
@@ -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/eclass/qt4-build.eclass,v 1.162 2015/03/23
02:15:14 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.163 2015/04/01
18:45:04 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -16,7 +16,7 @@
inherit eutils flag-o-matic multilib toolchain-funcs
-HOMEPAGE=https://www.qt.io/ https://qt-project.org/;
+HOMEPAGE=https://www.qt.io/;
LICENSE=|| ( LGPL-2.1 GPL-3 )
SLOT=4
@@ -24,8 +24,9 @@
4.?.)
QT4_BUILD_TYPE=live
EGIT_REPO_URI=(
- git://gitorious.org/qt/qt.git
- https://git.gitorious.org/qt/qt.git;
+
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
pesa15/03/23 02:15:14
Modified: ChangeLog qt4-build-multilib.eclass
qt4-build.eclass
Log:
Workaround toolchain bug on x86 with -Os and --as-needed, see bug #503500.
Revision ChangesPath
1.1573 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1573view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1573content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1572r2=1.1573
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1572
retrieving revision 1.1573
diff -u -r1.1572 -r1.1573
--- ChangeLog 22 Mar 2015 13:41:16 - 1.1572
+++ ChangeLog 23 Mar 2015 02:15:14 - 1.1573
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1572 2015/03/22
13:41:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1573 2015/03/23
02:15:14 pesa Exp $
+
+ 23 Mar 2015; Davide Pesavento p...@gentoo.org qt4-build.eclass,
+ qt4-build-multilib.eclass:
+ Workaround toolchain bug on x86 with -Os and --as-needed, see bug #503500.
22 Mar 2015; Michał Górny mgo...@gentoo.org python-single-r1.eclass:
Extend EAPI=4 whitelist to cover crossdev gdb.
1.8 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.8view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.8content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.7r2=1.8
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt4-build-multilib.eclass 15 Mar 2015 01:25:19 - 1.7
+++ qt4-build-multilib.eclass 23 Mar 2015 02:15:14 - 1.8
@@ -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/eclass/qt4-build-multilib.eclass,v 1.7
2015/03/15 01:25:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.8
2015/03/23 02:15:14 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -167,17 +167,25 @@
fi
fi
+ if [[ ${PN} == qtcore ]]; then
+ # Bug 373061
+ # qmake bus errors with -O2 or -O3 but -O1 works
+ if [[ ${CHOST} == *86*-apple-darwin* ]]; then
+ replace-flags -O[23] -O1
+ fi
+
+ # Bug 503500
+ # undefined reference with -Os and --as-needed
+ if use x86 || use_if_iuse abi_x86_32; then
+ replace-flags -Os -O2
+ fi
+ fi
+
# Bug 261632
if use ppc64; then
append-flags -mminimal-toc
fi
- # Bug 373061
- # qmake bus errors with -O2 or -O3 but -O1 works
- if [[ ${CHOST} == *86*-apple-darwin* ]]; then
- replace-flags -O[23] -O1
- fi
-
# Bug 417105
# graphite on gcc 4.7 causes miscompilations
if [[ $(gcc-version) == 4.7 ]]; then
1.162eclass/qt4-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.162view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.162content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.161r2=1.162
Index: qt4-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- qt4-build.eclass15 Mar 2015 01:25:19 - 1.161
+++ qt4-build.eclass23 Mar 2015 02:15:14 - 1.162
@@ -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/eclass/qt4-build.eclass,v 1.161 2015/03/15
01:25:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.162 2015/03/23
02:15:14 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -172,10 +172,18 @@
skip_qmake_build
skip_project_generation
symlink_binaries_to_buildtree
- fi
+ else
+ # Bug 373061
+ # qmake bus errors with -O2 or -O3 but -O1 works
+ if [[
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
pesa15/03/15 01:25:19 Modified: ChangeLog qt4-build-multilib.eclass qt4-build.eclass Log: Fix indentation. Revision ChangesPath 1.1563 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1563view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1563content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1562r2=1.1563 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1562 retrieving revision 1.1563 diff -u -r1.1562 -r1.1563 --- ChangeLog 14 Mar 2015 14:32:10 - 1.1562 +++ ChangeLog 15 Mar 2015 01:25:19 - 1.1563 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1562 2015/03/14 14:32:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1563 2015/03/15 01:25:19 pesa Exp $ + + 15 Mar 2015; Davide Pesavento p...@gentoo.org qt4-build.eclass, + qt4-build-multilib.eclass: + Fix indentation. 14 Mar 2015; Andreas K. Huettel dilfri...@gentoo.org perl-module.eclass: Turn deprecated functions into fatal errors 1.7 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.7view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.7content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.6r2=1.7 Index: qt4-build-multilib.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qt4-build-multilib.eclass 11 Mar 2015 14:07:56 - 1.6 +++ qt4-build-multilib.eclass 15 Mar 2015 01:25:19 - 1.7 @@ -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/eclass/qt4-build-multilib.eclass,v 1.6 2015/03/11 14:07:56 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.7 2015/03/15 01:25:19 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -291,7 +291,7 @@ x86-macos)arch=x86 ;; x86*) arch=i386 ;; alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;; - arm64|hppa|sh)arch=generic ;; + arm64|hppa|sh)arch=generic ;; *) die qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)' ;; esac 1.161eclass/qt4-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.161view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.161content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.160r2=1.161 Index: qt4-build.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- qt4-build.eclass11 Mar 2015 14:07:56 - 1.160 +++ qt4-build.eclass15 Mar 2015 01:25:19 - 1.161 @@ -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/eclass/qt4-build.eclass,v 1.160 2015/03/11 14:07:56 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.161 2015/03/15 01:25:19 pesa Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -326,7 +326,7 @@ x86-macos)conf+= -arch x86 ;; x86|x86-*)conf+= -arch i386 ;; alpha|arm|ia64|mips|s390) conf+= -arch $(tc-arch) ;; - arm64|hppa|sh) conf+= -arch generic ;; + arm64|hppa|sh)conf+= -arch generic ;; *) die $(tc-arch) is unsupported by this eclass. Please file a bug. ;; esac
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
dlan15/03/11 14:07:56 Modified: ChangeLog qt4-build-multilib.eclass qt4-build.eclass Log: set ARCH=arm64 as generic target for qt4 eclass Revision ChangesPath 1.1561 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1561view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1561content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1560r2=1.1561 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1560 retrieving revision 1.1561 diff -u -r1.1560 -r1.1561 --- ChangeLog 8 Mar 2015 09:39:55 - 1.1560 +++ ChangeLog 11 Mar 2015 14:07:56 - 1.1561 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1560 2015/03/08 09:39:55 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1561 2015/03/11 14:07:56 dlan Exp $ + + 11 Mar 2015; Yixun Lan d...@gentoo.org qt4-build.eclass, + qt4-build-multilib.eclass: + set ARCH=arm64 as generic target for qt4 eclass 08 Mar 2015; Ulrich Müller u...@gentoo.org mysql-multilib.eclass, mysql-v2.eclass: 1.6 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.6view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.6content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.5r2=1.6 Index: qt4-build-multilib.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qt4-build-multilib.eclass 6 Mar 2015 14:08:07 - 1.5 +++ qt4-build-multilib.eclass 11 Mar 2015 14:07:56 - 1.6 @@ -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/eclass/qt4-build-multilib.eclass,v 1.5 2015/03/06 14:08:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.6 2015/03/11 14:07:56 dlan Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -290,8 +290,8 @@ sparc*) arch=sparc ;; x86-macos)arch=x86 ;; x86*) arch=i386 ;; - alpha|arm|arm64|ia64|mips|s390) arch=$(tc-arch) ;; - hppa|sh) arch=generic ;; + alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;; + arm64|hppa|sh)arch=generic ;; *) die qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)' ;; esac 1.160eclass/qt4-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.160view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.160content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.159r2=1.160 Index: qt4-build.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- qt4-build.eclass6 Mar 2015 14:08:07 - 1.159 +++ qt4-build.eclass11 Mar 2015 14:07:56 - 1.160 @@ -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/eclass/qt4-build.eclass,v 1.159 2015/03/06 14:08:07 dlan Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.160 2015/03/11 14:07:56 dlan Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -325,8 +325,8 @@ sparc|sparc-*|sparc64-*) conf+= -arch sparc ;; x86-macos)conf+= -arch x86 ;; x86|x86-*)conf+= -arch i386 ;; - alpha|arm|arm64|ia64|mips|s390) conf+= -arch $(tc-arch) ;; - hppa|sh) conf+= -arch generic ;; + alpha|arm|ia64|mips|s390) conf+= -arch $(tc-arch) ;; + arm64|hppa|sh) conf+= -arch generic ;; *) die $(tc-arch) is unsupported by this eclass. Please file a bug. ;; esac
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
dlan15/03/06 14:08:07 Modified: ChangeLog qt4-build-multilib.eclass qt4-build.eclass Log: very first step to support arm64, only part of qt4 ebuilds built without paches, others require extra patches Revision ChangesPath 1.1559 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1559view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1559content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1558r2=1.1559 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1558 retrieving revision 1.1559 diff -u -r1.1558 -r1.1559 --- ChangeLog 6 Mar 2015 01:32:36 - 1.1558 +++ ChangeLog 6 Mar 2015 14:08:07 - 1.1559 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1558 2015/03/06 01:32:36 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1559 2015/03/06 14:08:07 dlan Exp $ + + 06 Mar 2015; Yixun Lan d...@gentoo.org qt4-build.eclass, + qt4-build-multilib.eclass: + very first step to support arm64, only part of qt4 ebuilds built without + paches, others require extra patches 06 Mar 2015; Chí-Thanh Christopher Nguyễn chith...@gentoo.org xorg-2.eclass: 1.5 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.5view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.5content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.4r2=1.5 Index: qt4-build-multilib.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qt4-build-multilib.eclass 18 Jan 2015 01:49:43 - 1.4 +++ qt4-build-multilib.eclass 6 Mar 2015 14:08:07 - 1.5 @@ -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/eclass/qt4-build-multilib.eclass,v 1.4 2015/01/18 01:49:43 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.5 2015/03/06 14:08:07 dlan Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -290,7 +290,7 @@ sparc*) arch=sparc ;; x86-macos)arch=x86 ;; x86*) arch=i386 ;; - alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;; + alpha|arm|arm64|ia64|mips|s390) arch=$(tc-arch) ;; hppa|sh) arch=generic ;; *) die qt4-build-multilib.eclass: unsupported tc-arch '$(tc-arch)' ;; esac 1.159eclass/qt4-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.159view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.159content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.158r2=1.159 Index: qt4-build.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- qt4-build.eclass18 Jan 2015 01:49:43 - 1.158 +++ qt4-build.eclass6 Mar 2015 14:08:07 - 1.159 @@ -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/eclass/qt4-build.eclass,v 1.158 2015/01/18 01:49:43 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.159 2015/03/06 14:08:07 dlan Exp $ # @ECLASS: qt4-build.eclass # @MAINTAINER: @@ -325,7 +325,7 @@ sparc|sparc-*|sparc64-*) conf+= -arch sparc ;; x86-macos)conf+= -arch x86 ;; x86|x86-*)conf+= -arch i386 ;; - alpha|arm|ia64|mips|s390) conf+= -arch $(tc-arch) ;; + alpha|arm|arm64|ia64|mips|s390) conf+= -arch $(tc-arch) ;; hppa|sh) conf+= -arch generic ;; *) die $(tc-arch) is unsupported by this eclass. Please file a bug. ;; esac
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass qt5-build.eclass
pesa15/01/18 01:49:43
Modified: ChangeLog qt4-build-multilib.eclass
qt4-build.eclass qt5-build.eclass
Log:
Update SRC_URIs
Revision ChangesPath
1.1513 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1513view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1513content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1512r2=1.1513
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1512
retrieving revision 1.1513
diff -u -r1.1512 -r1.1513
--- ChangeLog 17 Jan 2015 20:54:25 - 1.1512
+++ ChangeLog 18 Jan 2015 01:49:43 - 1.1513
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1512 2015/01/17
20:54:25 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1513 2015/01/18
01:49:43 pesa Exp $
+
+ 18 Jan 2015; Davide Pesavento p...@gentoo.org qt4-build.eclass,
+ qt4-build-multilib.eclass, qt5-build.eclass:
+ Update SRC_URIs
17 Jan 2015; Manuel Rüger mr...@gentoo.org rox-0install.eclass,
rox.eclass:
1.4 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.4view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.4content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.3r2=1.4
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt4-build-multilib.eclass 18 Dec 2014 14:35:03 - 1.3
+++ qt4-build-multilib.eclass 18 Jan 2015 01:49:43 - 1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.3
2014/12/18 14:35:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.4
2015/01/18 01:49:43 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -36,7 +36,7 @@
*)
QT4_BUILD_TYPE=release
MY_P=qt-everywhere-opensource-src-${PV/_/-}
-
SRC_URI=http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
+
SRC_URI=http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
S=${WORKDIR}/${MY_P}
;;
esac
1.158eclass/qt4-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.158view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.158content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.157r2=1.158
Index: qt4-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- qt4-build.eclass17 Nov 2014 01:31:41 - 1.157
+++ qt4-build.eclass18 Jan 2015 01:49:43 - 1.158
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.157 2014/11/17
01:31:41 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.158 2015/01/18
01:49:43 pesa Exp $
# @ECLASS: qt4-build.eclass
# @MAINTAINER:
@@ -33,7 +33,7 @@
*)
QT4_BUILD_TYPE=release
MY_P=qt-everywhere-opensource-src-${PV/_/-}
-
SRC_URI=http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
+
SRC_URI=http://download.qt.io/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
S=${WORKDIR}/${MY_P}
;;
esac
1.13 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.13view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.13content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.12r2=1.13
Index: qt5-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa14/12/18 14:35:03
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Fix breakage caused by recent multilib-build.eclass changes (bug 532510).
Revision ChangesPath
1.1467 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1467view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1467content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1466r2=1.1467
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1466
retrieving revision 1.1467
diff -u -r1.1466 -r1.1467
--- ChangeLog 17 Dec 2014 16:40:53 - 1.1466
+++ ChangeLog 18 Dec 2014 14:35:03 - 1.1467
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1466 2014/12/17
16:40:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1467 2014/12/18
14:35:03 pesa Exp $
+
+ 18 Dec 2014; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Fix breakage caused by recent multilib-build.eclass changes (bug 532510).
+ Patch by zorry, based on a previous patch by Greg Turner. Thanks also to
+ floppym and mgorny for the initial investigation and suggestions.
17 Dec 2014; Andreas K. Huettel dilfri...@gentoo.org perl-module.eclass:
Remove code paths that are not called anymore
1.3 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.3view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.3content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.2r2=1.3
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt4-build-multilib.eclass 17 Nov 2014 00:24:43 - 1.2
+++ qt4-build-multilib.eclass 18 Dec 2014 14:35:03 - 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.2
2014/11/17 00:24:43 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.3
2014/12/18 14:35:03 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -272,10 +272,14 @@
qt4_symlink_tools_to_build_dir
- # toolchain setup
- tc-export CC CXX OBJCOPY STRIP
- export AR=$(tc-getAR) cqs
- export LD=$(tc-getCXX)
+ # toolchain setup ('local -x' because of bug 532510)
+ local -x \
+ AR=$(tc-getAR) cqs \
+ CC=$(tc-getCC) \
+ CXX=$(tc-getCXX) \
+ LD=$(tc-getCXX) \
+ OBJCOPY=$(tc-getOBJCOPY) \
+ STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
local arch=
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa14/11/17 00:24:43 Modified: ChangeLog qt4-build-multilib.eclass Log: Add blocker on emul-linux-x86-qtlibs wrt bug 529370. Revision ChangesPath 1.1424 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1424view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1424content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1423r2=1.1424 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1423 retrieving revision 1.1424 diff -u -r1.1423 -r1.1424 --- ChangeLog 16 Nov 2014 20:22:40 - 1.1423 +++ ChangeLog 17 Nov 2014 00:24:43 - 1.1424 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1423 2014/11/16 20:22:40 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1424 2014/11/17 00:24:43 pesa Exp $ + + 17 Nov 2014; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass: + Add blocker on emul-linux-x86-qtlibs wrt bug 529370. 16 Nov 2014; Andreas K. Huettel dilfri...@gentoo.org perl-module.eclass: Make calling perlinfo trigger a real warning 1.2 eclass/qt4-build-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.2view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.2content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.1r2=1.2 Index: qt4-build-multilib.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qt4-build-multilib.eclass 13 Nov 2014 01:45:07 - 1.1 +++ qt4-build-multilib.eclass 17 Nov 2014 00:24:43 - 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.1 2014/11/13 01:45:07 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.2 2014/11/17 00:24:43 pesa Exp $ # @ECLASS: qt4-build-multilib.eclass # @MAINTAINER: @@ -52,6 +52,7 @@ RDEPEND= dev-qt/qtchooser + abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa14/11/13 01:45:07
Modified: ChangeLog
Added:qt4-build-multilib.eclass
Log:
Initial commit of qt4-build-multilib.eclass
Revision ChangesPath
1.1416 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1416view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1416content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1415r2=1.1416
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1415
retrieving revision 1.1416
diff -u -r1.1415 -r1.1416
--- ChangeLog 12 Nov 2014 23:26:36 - 1.1415
+++ ChangeLog 13 Nov 2014 01:45:07 - 1.1416
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1415 2014/11/12
23:26:36 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1416 2014/11/13
01:45:07 pesa Exp $
+
+ 13 Nov 2014; Davide Pesavento p...@gentoo.org +qt4-build-multilib.eclass:
+ Initial commit of qt4-build-multilib.eclass
12 Nov 2014; Patrice Clement monsie...@gentoo.org perl-module.eclass:
Documented nearly all functions.
1.1 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.1view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.1content-type=text/plain
Index: qt4-build-multilib.eclass
===
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.1
2014/11/13 01:45:07 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
# Qt herd q...@gentoo.org
# @AUTHOR:
# Davide Pesavento p...@gentoo.org
# @BLURB: Eclass for Qt4 split ebuilds with multilib support.
# @DESCRIPTION:
# This eclass contains various functions that are used when building Qt4.
# Requires EAPI 5.
case ${EAPI} in
5) : ;;
*) die qt4-build-multilib.eclass: unsupported EAPI=${EAPI:-0} ;;
esac
inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs
HOMEPAGE=https://www.qt.io/ https://qt-project.org/;
LICENSE=|| ( LGPL-2.1 GPL-3 )
SLOT=4
case ${PV} in
4.?.)
QT4_BUILD_TYPE=live
EGIT_REPO_URI=(
git://gitorious.org/qt/qt.git
https://git.gitorious.org/qt/qt.git;
)
EGIT_BRANCH=${PV%.}
inherit git-r3
;;
*)
QT4_BUILD_TYPE=release
MY_P=qt-everywhere-opensource-src-${PV/_/-}
SRC_URI=http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
S=${WORKDIR}/${MY_P}
;;
esac
if [[ ${PN} != qttranslations ]]; then
IUSE=aqua debug pch
[[ ${PN} != qtxmlpatterns ]] IUSE+= +exceptions
fi
DEPEND=
dev-lang/perl
virtual/pkgconfig[${MULTILIB_USEDEP}]
RDEPEND=
dev-qt/qtchooser
# src_{configure,compile,test,install} are inherited from multilib-minimal
EXPORT_FUNCTIONS src_unpack src_prepare pkg_postinst pkg_postrm
multilib_src_configure(){ qt4_multilib_src_configure; }
multilib_src_compile() { qt4_multilib_src_compile; }
multilib_src_test() { qt4_multilib_src_test; }
multilib_src_install() { qt4_multilib_src_install; }
multilib_src_install_all() { qt4_multilib_src_install_all; }
# @ECLASS-VARIABLE: PATCHES
# @DEFAULT_UNSET
# @DESCRIPTION:
# Array variable containing all the patches to be applied. This variable
# is expected to be defined in the global scope of ebuilds. Make sure to
# specify the full path. This variable is used in src_prepare phase.
#
# Example:
# @CODE
# PATCHES=(
# ${FILESDIR}/mypatch.patch
# ${FILESDIR}/mypatch2.patch
# )
# @CODE
# @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
# @DEFAULT_UNSET
# @DESCRIPTION:
# Space-separated list of directories that will be configured,
# compiled, and installed. All paths must be relative to ${S}.
# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
# @DESCRIPTION:
# Set to false to reduce build output during compilation.
: ${QT4_VERBOSE_BUILD:=true}
# @ECLASS-VARIABLE: QCONFIG_ADD
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of options that must be added to QT_CONFIG in qconfig.pri
# @ECLASS-VARIABLE: QCONFIG_REMOVE
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of options that must be removed from QT_CONFIG in qconfig.pri
# @ECLASS-VARIABLE: QCONFIG_DEFINE
# @DEFAULT_UNSET
# @DESCRIPTION:
# List of macros
