[patch] patch to qt-core ebuild

qt-core-4.7.0_beta2.diff (text/plain), 2.98 KB, created by Matthias Fauconneau on 2010-07-11 19:32:58 UTC

--- x11-libs/qt-core/qt-core-4.7.0_beta2.ebuild	2010-07-10 18:08:00.000000000 +0200
+++ /usr/local/portage/x11-libs/qt-core/qt-core-4.7.0_beta2.ebuild	2010-07-10 20:31:39.000000000 +0200
@@ -19,18 +19,27 @@
 PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[glib=,qt3support] )"
 
 pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/tools/bootstrap
-		src/tools/moc
-		src/tools/rcc
-		src/tools/uic
-		src/corelib
-		src/xml
-		src/network
-		src/plugins/codecs
-		tools/linguist/lconvert
-		tools/linguist/lrelease
-		tools/linguist/lupdate"
+	if tc-is-cross-compiler; then #don't build moc,rcc,uic when crosscompiling qt-core #TODO: build for target while using native one for xcompilation
+ 		QT4_TARGET_DIRECTORIES="
+			src/tools/bootstrap
+ 			src/corelib
+ 			src/xml
+ 			src/network
+ 			src/plugins/codecs"
+ 	else
+		QT4_TARGET_DIRECTORIES="
+			src/tools/bootstrap
+			src/tools/moc
+			src/tools/rcc
+			src/tools/uic
+			src/corelib
+			src/xml
+			src/network
+			src/plugins/codecs
+			tools/linguist/lconvert
+			tools/linguist/lrelease
+			tools/linguist/lupdate"
+	fi
 
 	QT4_EXTRACT_DIRECTORIES="
 		include/Qt
@@ -43,12 +52,7 @@
 		src/plugins/plugins.pro
 		src/plugins/qpluginbase.pri
 		src/src.pro
-		src/3rdparty/des
-		src/3rdparty/harfbuzz
-		src/3rdparty/md4
-		src/3rdparty/md5
-		src/3rdparty/sha1/
-		src/3rdparty/easing
+		src/3rdparty
 		src/declarative
 		src/gui
 		src/script
@@ -62,6 +66,11 @@
 }
 
 src_prepare() {
+	if tc-is-cross-compiler; then #don't build qmake when crosscompiling qt-core #TODO: build for target while using native one for xcompilation
+ 		skip_qmake_build_patch
+ 		symlink_binaries_to_buildtree
+ 	fi
+
 	# Don't pre-strip, bug 235026
 	for i in kr jp cn tw ; do
 		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
@@ -103,7 +112,7 @@
 }
 
 src_install() {
-	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die
+	tc-is-cross-compiler || dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die #crosscompilation does not build these tools
 
 	install_directories src/{corelib,xml,network,plugins/codecs}
 
@@ -114,14 +123,17 @@
 		insinto ${QTHEADERDIR}/QtCore/private
 		find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
 	fi
-	# use freshly built libraries
-	local DYLD_FPATH=
-	[[ -d "${S}"/lib/QtCore.framework ]] \
-		&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
-	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
-	LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
-	insinto ${QTTRANSDIR}
-	doins translations/*.qm || die
+
+	if ! tc-is-cross-compiler; then #lrelease is not build
+	  # use freshly built libraries
+	  local DYLD_FPATH=
+	  [[ -d "${S}"/lib/QtCore.framework ]] \
+		  && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
+	  DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+	  LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
+	  insinto ${QTTRANSDIR}
+	  doins translations/*.qm || die
+	fi
 
 	setqtenv
 	fix_library_files