From 7db66f313c397c80a2aa29a1316b241c988194da Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 05 Aug 2019 19:31:31 +0800
Subject: [PATCH] update qt build shell script and update busybox configure file. fix bugs
---
3rdparty/busybox/config/busybox-1.31.0.config | 10 +++++-----
3rdparty/qt/build_QT5.sh | 11 +++++++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/3rdparty/busybox/config/busybox-1.31.0.config b/3rdparty/busybox/config/busybox-1.31.0.config
index c69c9bd..e97ebca 100644
--- a/3rdparty/busybox/config/busybox-1.31.0.config
+++ b/3rdparty/busybox/config/busybox-1.31.0.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.31.0
-# Mon Aug 5 15:50:01 2019
+# Mon Aug 5 19:21:11 2019
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -948,10 +948,10 @@
# CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-# CONFIG_TFTP is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
-CONFIG_TFTPD=y
+CONFIG_TFTP=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+CONFIG_FEATURE_TFTP_HPA_COMPAT=y
+# CONFIG_TFTPD is not set
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
diff --git a/3rdparty/qt/build_QT5.sh b/3rdparty/qt/build_QT5.sh
index fd3cef8..b8b5dfd 100755
--- a/3rdparty/qt/build_QT5.sh
+++ b/3rdparty/qt/build_QT5.sh
@@ -93,11 +93,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