From 5e9d03d507aad324a803eb8795e0eed6fb671761 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Mon, 10 Jul 2023 15:24:52 +0800
Subject: [PATCH] Merge branch 'master' of http://master.iot-yun.club:8088/r/raspberrypi

---
 3rdparty/x86/qt/build.sh |  192 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 151 insertions(+), 41 deletions(-)

diff --git a/3rdparty/x86/qt/build.sh b/3rdparty/x86/qt/build.sh
index a4fead7..be2198c 100755
--- a/3rdparty/x86/qt/build.sh
+++ b/3rdparty/x86/qt/build.sh
@@ -17,18 +17,33 @@
 PRJ_PATH=`pwd`
 LIBS_PATH=$PRJ_PATH/install
 
-#QT_INST_PATH=/apps/QT5.9_RPI
-QT_INST_PATH=/apps/QT5.6_RPi
+QT_INST_PATH=/apps/qt5_rpi
 
-CROSSTOOL=/opt/rpi/arm-bcm2708/arm-linux-gnueabihf/bin/arm-linux-
+# sudo apt install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
+CROSSTOOL=arm-linux-gnueabihf-
 
 LYFTP_SRC=ftp://master.iot-yun.club/src/
+
+# display in red
+function pr_error() {
+    echo -e "\033[40;31m --E-- $1 \033[0m"
+}
+
+# display in yellow
+function pr_warn() {
+    echo -e "\033[40;33m --W-- $1 \033[0m"
+}
+
+# display in green
+function pr_info() {
+    echo -e "\033[40;32m --I-- $1 \033[0m"
+}
 
 function msg_banner()
 {
     echo ""
     echo "+-----------------------------------------------------------------------"
-    echo "|  $1 "
+    echo -e "|\033[40;33m  $1 \033[0m"
     echo "+-----------------------------------------------------------------------"
     echo ""
 }
@@ -36,19 +51,13 @@
 function check_result()
 {
     if [ $? != 0 ] ; then
-       echo ""
-       echo "+-----------------------------------------------------------------------"
-       echo "|  $1 "
-       echo "+-----------------------------------------------------------------------"
-       echo ""
-       exit ;
+		pr_error $1
     fi
 }
 
-function compile_qt()
+function compile_qt5()
 {
     # 5.6.3 is the last version can be compiled by g++ without c++11 support
-    #SRC_NAME=qt-everywhere-opensource-src-5.9.8
     SRC_NAME=qt-everywhere-opensource-src-5.6.3
 
     PACK_SUFIX=tar.xz
@@ -62,60 +71,161 @@
     if [ ! -f ${SRC_NAME}.${PACK_SUFIX} ] ; then 
         msg_banner "Start download ${SRC_NAME}.${PACK_SUFIX} "
         wget ${LYFTP_SRC}/qt/${SRC_NAME}.${PACK_SUFIX}
-        check_result "ERROR: download ${SRC_NAME} failure"
+        check_result "download ${SRC_NAME} failure"
     fi
 
-    msg_banner "Start decompress $SRC_NAME.${PACK_SUFIX} "
+    msg_banner "Start decompress $SRC_NAME.${PACK_SUFIX} and patch"
     if [ ! -d ${SRC_NAME} ] ; then
         tar -xJf ${SRC_NAME}.${PACK_SUFIX}
+		patch -p0 < patch/${SRC_NAME}.patch
     fi
 
     cd ${SRC_NAME}
 
     QMAKE_FILE=qtbase/mkspecs/linux-arm-gnueabi-g++/qmake.conf
 
-    grep "`dirname ${CROSSTOOL}`" ${QMAKE_FILE} > /dev/null 2>&1
+    grep "`basename ${CROSSTOOL}`" ${QMAKE_FILE} > /dev/null 2>&1
     if [ $? != 0 ] ; then 
         sed -i "s|arm-linux-gnueabi-|$CROSSTOOL|" ${QMAKE_FILE}
-    fi
+    fi 
 
-    ./configure -opensource -confirm-license -release -shared -strip -prefix ${QT_INST_PATH} -c++std c++11 \
-        -xplatform linux-arm-gnueabi-g++ -qt-freetype -no-libproxy -no-avx  -make libs \
-        -qt-zlib -no-mtdev -no-gif -qt-libpng  -qt-libjpeg -no-openssl -no-cups -no-dbus -pch \
-        -no-xcb -no-eglfs -no-kms -no-directfb -no-opengl -linuxfb -qpa linuxfb \
-        -no-sse2 -no-sse3 -no-ssse3 -no-sse4.1 -no-sse4.2 -no-rpath -no-glib \
-        -no-separate-debug-info -nomake tests -nomake tools -nomake examples \
-        -tslib -I${LIBS_PATH}/include/  -L${LIBS_PATH}/lib/  -I${QT_INST_PATH}/include/  -L${QT_INST_PATH}/lib/ 
+    ./configure -opensource -confirm-license -release -shared -strip -no-c++11 \
+        -prefix ${QT_INST_PATH} -xplatform linux-arm-gnueabi-g++ -make libs \
+        -no-cups -no-libproxy -no-avx -no-mtdev -no-rpath -no-glib -no-xcb -pch \
+        -no-eglfs -no-opengl -no-openssl -no-separate-debug-info -nomake tests \
+        -qt-freetype -qt-zlib -qt-libpng -qt-libjpeg -tslib -linuxfb -qpa linuxfb \
+        -I${LIBS_PATH}/include/ -L${LIBS_PATH}/lib/ -I${QT_INST_PATH}/include/ -L${QT_INST_PATH}/lib/
 
     msg_banner "Start cross compile $SRC_NAME "
     make -j${JOBS} && make install
-    check_result "ERROR: compile ${SRC_NAME} failure"
+    check_result "compile ${SRC_NAME} failure"
     cp ./qtbase/plugins/platforms/libqlinuxfb.so  ${QT_INST_PATH}/lib
     cp -af ${LIBS_PATH}/lib/libts*so* ${QT_INST_PATH}/lib
 
     cd -
 }
 
-
-if [[ $# == 1 ]] && [[ $1 == "clean" ]] ; then 
-    rm -rf qt* 
-    rm -rf libiconv/libiconv*
-    rm -rf tslib/tslib*
-    rm -rf install
-    exit 
-fi
+function compile_tslib()
+{
+    SRC_NAME=tslib-1.22
+    PACK_SUFIX=tar.bz2
 
 
-if [ ! -f ${LIBS_PATH}/lib/libiconv.so ] ; then
-    cd ./libiconv
-        ./build.sh 
-    cd -
-fi
+    if [ -f ${LIBS_PATH}/lib/libts.so ] ; then
+        msg_banner "Already cross compile $SRC_NAME "
+        return 0;
+    fi  
 
-cd tslib
-  ./build.sh
-cd -
+	mkdir -p libs && cd libs
 
-compile_qt
+    msg_banner "Start cross compile $SRC_NAME "
 
+    if [ ! -f ${SRC_NAME}.${PACK_SUFIX} ] ; then
+        #tslib official download address: https://github.com/libts/tslib/tags
+        wget ${LYFTP_SRC}/${SRC_NAME}.${PACK_SUFIX}
+        check_result "download ${SRC_NAME} failure"
+    fi  
+
+    tar -xjf ${SRC_NAME}.${PACK_SUFIX} 
+    cd ${SRC_NAME}
+
+    ./configure --prefix=${LIBS_PATH} ${CONFIG_CROSS}
+    make && make install
+
+    cd ${PRJ_PATH}
+}
+
+function compile_libiconv()
+{
+    SRC_NAME=libiconv-1.15
+    PACK_SUFIX=tar.gz
+
+    if [ -f ${LIBS_PATH}/lib/libiconv.so ] ; then
+        msg_banner "Already cross compile $SRC_NAME "
+        return 0;
+    fi  
+
+	mkdir -p libs && cd libs
+
+    msg_banner "Start cross compile $SRC_NAME "
+
+    if [ ! -f ${SRC_NAME}.${PACK_SUFIX} ] ; then
+        #wget https://ftp.gnu.org/gnu/libiconv/${SRC_NAME}.${PACK_SUFIX}
+        wget ${LYFTP_SRC}/${SRC_NAME}.${PACK_SUFIX}
+        check_result "download ${SRC_NAME} failure"
+    fi  
+
+    tar -xzf ${SRC_NAME}.${PACK_SUFIX} 
+    cd ${SRC_NAME}
+
+    ./configure --prefix=${LIBS_PATH} ${CONFIG_CROSS}
+    make && make install
+
+    cd ${PRJ_PATH}
+}
+
+
+function export_cross()
+{
+    # export cross toolchain
+    export CC=${CROSSTOOL}gcc
+    export AS=${CROSSTOOL}as
+    export AR=${CROSSTOOL}ar
+    export LD=${CROSSTOOL}ld
+    export NM=${CROSSTOOL}nm
+    export RANLIB=${CROSSTOOL}ranlib
+    export OBJDUMP=${CROSSTOOL}objdump
+    export STRIP=${CROSSTOOL}strip
+
+    # export cross configure 
+    export CONFIG_CROSS=" --build=i686-pc-linux --host=arm-linux "
+
+    # Clear LDFLAGS and CFLAGS
+    export LDFLAGS=
+    export CFLAGS=
+}
+
+function unexport_cross()
+{
+    # export cross toolchain
+    export CC=""
+    export AS=""
+    export AR=""
+    export LD=""
+    export NM=""
+    export RANLIB=""
+    export OBJDUMP=""
+    export STRIP=""
+
+    # export cross configure 
+    export CONFIG_CROSS=""
+
+    # Clear LDFLAGS and CFLAGS
+    export LDFLAGS=""
+    export CFLAGS=""
+}
+
+function check_deptool()
+{
+	${CROSSTOOL}g++ -v > /dev/null 2>&1
+	if [ $? != 0 ] ; then
+		echo ""
+		pr_error "Crosstool not installed, please install it by follow command:"
+		pr_info  "sudo apt install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf"
+		echo ""
+		exit 1;
+	fi
+}
+
+check_deptool
+
+export_cross
+
+compile_libiconv
+
+compile_tslib
+
+unexport_cross
+
+compile_qt5
 

--
Gitblit v1.9.1