[oe-commits] Khem Raj : qt-4.7.1: Dont create symlinks for non existing binaries

git at git.openembedded.org git at git.openembedded.org
Mon Aug 27 22:43:48 UTC 2012


Module: openembedded.git
Branch: 2011.03-maintenance
Commit: 774fcb240ecf477fc48dec333bf07f1249a0e718
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=774fcb240ecf477fc48dec333bf07f1249a0e718

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Aug 24 05:57:02 2012 +0000

qt-4.7.1: Dont create symlinks for non existing binaries

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Tom Rini <trini at ti.com>

---

 recipes/qt4/qt-4.7.1.inc |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/recipes/qt4/qt-4.7.1.inc b/recipes/qt4/qt-4.7.1.inc
index bf3f39e..7177d26 100644
--- a/recipes/qt4/qt-4.7.1.inc
+++ b/recipes/qt4/qt-4.7.1.inc
@@ -49,10 +49,6 @@ do_compile() {
     fi
 
     unset CFLAGS CXXFLAGS
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${S}/bin/rcc
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${S}/bin/moc
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${S}/bin/uic
-    install -m 0755 ${STAGING_BINDIR_NATIVE}/lrelease4 ${S}/bin/lrelease
 
     oe_runmake ${EXTRA_ENV}
 }
@@ -60,7 +56,10 @@ do_compile() {
 do_install_append() {
 	install -d ${D}${bindir}
 	for i in rcc uic moc ; do
-		install -m 0755 ${S}/bin/$i ${D}${bindir}/
+		if [ -e ${S}/bin/$i ]
+		then
+			install -m 0755 ${S}/bin/$i ${D}${bindir}/
+		fi
 	done
 
         #Append an E to the qtdemo file





More information about the Openembedded-commits mailing list