Patchwork [2011.03-maintenance,2/5] qt-4.7.1: Dont create symlinks for non existing binaries

login
mail settings
Submitter Khem Raj
Date Aug. 24, 2012, 5:57 a.m.
Message ID <1345787825-9950-2-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/35267/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Khem Raj - Aug. 24, 2012, 5:57 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/qt4/qt-4.7.1.inc |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Patch

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