public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
@ 2015-03-06 14:08 Yixun Lan (dlan)
  0 siblings, 0 replies; 4+ messages in thread
From: Yixun Lan (dlan) @ 2015-03-06 14:08 UTC (permalink / raw
  To: gentoo-commits

dlan        15/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  Changes    Path
1.1559               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1559&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1559&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1558&r2=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 -0000	1.1558
+++ ChangeLog	6 Mar 2015 14:08:07 -0000	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 <dlan@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 <chithanh@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.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.4&r2=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 -0000	1.4
+++ qt4-build-multilib.eclass	6 Mar 2015 14:08:07 -0000	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.159                eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.158&r2=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.eclass	18 Jan 2015 01:49:43 -0000	1.158
+++ qt4-build.eclass	6 Mar 2015 14:08:07 -0000	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





^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
@ 2015-03-11 14:07 Yixun Lan (dlan)
  0 siblings, 0 replies; 4+ messages in thread
From: Yixun Lan (dlan) @ 2015-03-11 14:07 UTC (permalink / raw
  To: gentoo-commits

dlan        15/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  Changes    Path
1.1561               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1561&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1561&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1560&r2=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 -0000	1.1560
+++ ChangeLog	11 Mar 2015 14:07:56 -0000	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 <dlan@gentoo.org> qt4-build.eclass,
+  qt4-build-multilib.eclass:
+  set ARCH=arm64 as generic target for qt4 eclass
 
   08 Mar 2015; Ulrich Müller <ulm@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.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.5&r2=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 -0000	1.5
+++ qt4-build-multilib.eclass	11 Mar 2015 14:07:56 -0000	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.160                eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.159&r2=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.eclass	6 Mar 2015 14:08:07 -0000	1.159
+++ qt4-build.eclass	11 Mar 2015 14:07:56 -0000	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
 





^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
@ 2015-03-15  1:25 Davide Pesavento (pesa)
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento (pesa) @ 2015-03-15  1:25 UTC (permalink / raw
  To: gentoo-commits

pesa        15/03/15 01:25:19

  Modified:             ChangeLog qt4-build-multilib.eclass
                        qt4-build.eclass
  Log:
  Fix indentation.

Revision  Changes    Path
1.1563               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1563&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1563&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1562&r2=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 -0000	1.1562
+++ ChangeLog	15 Mar 2015 01:25:19 -0000	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 <pesa@gentoo.org> qt4-build.eclass,
+  qt4-build-multilib.eclass:
+  Fix indentation.
 
   14 Mar 2015; Andreas K. Huettel <dilfridge@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.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.6&r2=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 -0000	1.6
+++ qt4-build-multilib.eclass	15 Mar 2015 01:25:19 -0000	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.161                eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.160&r2=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.eclass	11 Mar 2015 14:07:56 -0000	1.160
+++ qt4-build.eclass	15 Mar 2015 01:25:19 -0000	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
 





^ permalink raw reply	[flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass
@ 2015-03-23  2:15 Davide Pesavento (pesa)
  0 siblings, 0 replies; 4+ messages in thread
From: Davide Pesavento (pesa) @ 2015-03-23  2:15 UTC (permalink / raw
  To: gentoo-commits

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 <pesa@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 <mgorny@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\





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-03-23  2:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-06 14:08 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass qt4-build.eclass Yixun Lan (dlan)
  -- strict thread matches above, loose matches on Subject: below --
2015-03-11 14:07 Yixun Lan (dlan)
2015-03-15  1:25 Davide Pesavento (pesa)
2015-03-23  2:15 Davide Pesavento (pesa)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox