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

["Alex Alexander (wired)" <wired@gentoo.org>]

wired       11/03/10 23:45:52

  Modified:             qt4-build.eclass
  Log:
  moved makefile generation from compile to configure phase.

Revision  Changes    Path
1.90                 eclass/qt4-build.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build.eclass?r1=1.89&r2=1.90

Index: qt4-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- qt4-build.eclass	3 Mar 2011 21:39:29 -0000	1.89
+++ qt4-build.eclass	10 Mar 2011 23:45:51 -0000	1.90
@@ -1,6 +1,6 @@
 # Copyright 1999-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.89 2011/03/03 21:39:29 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build.eclass,v 1.90 2011/03/10 23:45:51 wired Exp $
 
 # @ECLASS: qt4-build.eclass
 # @MAINTAINER:
@@ -340,6 +340,8 @@
 	echo ./configure ${myconf}
 	./configure ${myconf} || die "./configure failed"
 	myconf=""
+
+	prepare_directories ${QT4_TARGET_DIRECTORIES}
 }
 
 # @FUNCTION: qt4-build_src_compile
@@ -493,19 +495,32 @@
 	echo "${myconf}"
 }
 
-# @FUNCTION: build_directories
+# @FUNCTION: prepare_directories
 # @USAGE: < directories >
 # @DESCRIPTION:
-# Compiles the code in $QT4_TARGET_DIRECTORIES
-build_directories() {
+# Generates makefiles for the directories set in $QT4_TARGET_DIRECTORIES
+prepare_directories() {
 	for x in "$@"; do
 		pushd "${S}"/${x} >/dev/null
+		einfo "running qmake in: $x"
 		# avoid running over the maximum argument number, bug #299810
 		{
 			echo "${S}"/mkspecs/common/*.conf
 			find "${S}" -name '*.pr[io]'
 		} | xargs sed -i -e "s:\$\$\[QT_INSTALL_LIBS\]:${EPREFIX}/usr/$(get_libdir)/qt4:g" || die
 		"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die "qmake failed"
+		popd >/dev/null
+	done
+}
+
+
+# @FUNCTION: build_directories
+# @USAGE: < directories >
+# @DESCRIPTION:
+# Compiles the code in $QT4_TARGET_DIRECTORIES
+build_directories() {
+	for x in "$@"; do
+		pushd "${S}"/${x} >/dev/null
 		emake CC="$(tc-getCC)" \
 			CXX="$(tc-getCXX)" \
 			LINK="$(tc-getCXX)" || die "emake failed"