pesa 15/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 Changes Path
1.1573 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1573&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1573&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1572&r2=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 -0000 1.1572
+++ ChangeLog 23 Mar 2015 02:15:14 -0000 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.8&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.8&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.7&r2=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 -0000 1.7
+++ qt4-build-multilib.eclass 23 Mar 2015 02:15:14 -0000 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.162 eclass/qt4-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.162&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.162&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.161&r2=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.eclass 15 Mar 2015 01:25:19 -0000 1.161
+++ qt4-build.eclass 23 Mar 2015 02:15:14 -0000 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 [[ ${CHOST} == *86*-apple-darwin* ]]; then
+ replace-flags -O[23] -O1
+ fi
- if use_if_iuse c++0x; then
- append-cxxflags -std=c++0x
+ # Bug 503500
+ # undefined reference with -Os and --as-needed
+ if use x86; then
+ replace-flags -Os -O2
+ fi
fi
# Bug 261632
@@ -183,18 +191,16 @@
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
filter-flags -fgraphite-identity
fi
+ if use_if_iuse c++0x; then
+ append-cxxflags -std=c++0x
+ fi
+
# Respect CC, CXX, {C,CXX,LD}FLAGS in .qmake.cache
sed -e "/^SYSTEM_VARIABLES=/i \
CC='$(tc-getCC)'\n\
