From 26c06979cd0a2f143732faa48329b9d4e2236d24 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 24 Aug 2019 16:50:52 +0800
Subject: [PATCH] update setup_env.sh to fix import bug
---
3rdparty/qt/build_QT5.sh | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/3rdparty/qt/build_QT5.sh b/3rdparty/qt/build_QT5.sh
index fd3cef8..36c8ac9 100755
--- a/3rdparty/qt/build_QT5.sh
+++ b/3rdparty/qt/build_QT5.sh
@@ -16,11 +16,12 @@
PRJ_PATH=`pwd`
LIBS_PATH=$PRJ_PATH/../install
-QT_INST_PATH=/apps/QT5.9_A8
-
-CROSSTOOL=/opt/crosstool/cortex-a7/bin/arm-linux-gnueabi-
+QT_INST_PATH=/apps/QT5.9_A5
LYFTP_SRC=ftp://master.iot-yun.club/src/
+
+CROSSTOOL=/opt/buildroot/cortex-a5/bin/arm-linux-
+
function msg_banner()
{
@@ -52,7 +53,7 @@
#rm -rf ${QT_INST_PATH}/lib/libQt5Gui.so
if [ -f ${QT_INST_PATH}/lib/libQt5Gui.so ] ; then
- msg_banner "Already cross compile $SRC_NAME "
+ msg_banner "$SRC_NAME already compile and installed"
return 0;
fi
@@ -93,11 +94,14 @@
cd -
}
-cd tslib
- ./build.sh
-cd -
-cd iconv
+if [ ! -f ${LIBS_PATH}/lib/libiconv.so ] ; then
+ cd ../iconv
+ ./build.sh
+ cd -
+fi
+
+cd tslib
./build.sh
cd -
--
Gitblit v1.9.1