[gentoo-commits] gentoo-x86 commit in eclass: qt4-build.eclass

[Ben de Groot (yngwin)]

yngwin      09/06/27 18:55:02

  Modified:             qt4-build.eclass
  Log:
  Remove custom-cxxflags from qt4-build.eclass

Revision  Changes    Path
1.40                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4-build.eclass?r1=1.39&r2=1.40

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- qt4-build.eclass	27 Jun 2009 12:37:32 -0000	1.39
+++ qt4-build.eclass	27 Jun 2009 18:55:02 -0000	1.40
@@ -1,6 +1,6 @@
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.39 2009/06/27 12:37:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.40 2009/06/27 18:55:02 yngwin Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -13,7 +13,7 @@
 
 inherit base eutils multilib toolchain-funcs flag-o-matic versionator
 
-IUSE="${IUSE} custom-cxxflags debug pch"
+IUSE="${IUSE} debug pch"
 RDEPEND="
 	!<x11-libs/qt-assistant-${PV}
 	!>x11-libs/qt-assistant-${PV}-r9999
@@ -109,17 +109,6 @@
 		echo
 		ebeep 3
 	fi
-
-	if use custom-cxxflags; then
-		echo
-		ewarn "You have set USE=custom-cxxflags, which means Qt will be built with the"
-		ewarn "CXXFLAGS you have set in /etc/make.conf. This is not supported, and we"
-		ewarn "recommend to unset this useflag. But you are free to experiment with it."
-		ewarn "Just do not start crying if it breaks your system, or eats your kitten"
-		ewarn "for breakfast. ;-) "
-		echo
-	fi
-
 }
 
 # @ECLASS-VARIABLE: QT4_TARGET_DIRECTORIES
@@ -186,12 +175,6 @@
 		symlink_binaries_to_buildtree
 	fi
 
-	if ! use custom-cxxflags;then
-		# Don't let the user go too overboard with flags.
-		strip-flags
-		replace-flags -O3 -O2
-	fi
-
 	# Bug 178652
 	if [[ "$(gcc-major-version)" == "3" ]] && use amd64; then
 		ewarn "Appending -fno-gcse to CFLAGS/CXXFLAGS"