[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     617835996185eeefad4c31ca50fc2be8dbe8b3c2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 23 02:16:30 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 23 02:16:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=61783599

[qt4-build-multilib.eclass] Sync.

 eclass/qt4-build-multilib.eclass | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index a9764e9..b171ba5 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -167,17 +167,25 @@ qt4-build-multilib_src_prepare() {
                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