From a41651b62ff13fd89aafefd5c1e0ef7a6e5b31ad Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 22 Aug 2024 18:03:49 +0800 Subject: [PATCH] rename 3rdparty to openlibs and rename CROSSTOOL to CROSS_COMPILER --- openlibs/qt/build_QT5.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/qt/build_QT5.sh b/openlibs/qt/build_QT5.sh similarity index 94% rename from 3rdparty/qt/build_QT5.sh rename to openlibs/qt/build_QT5.sh index 756a604..ff33cff 100755 --- a/3rdparty/qt/build_QT5.sh +++ b/openlibs/qt/build_QT5.sh @@ -25,7 +25,7 @@ LYFTP_SRC=http://master.weike-iot.com:2211/src/ -CROSSTOOL=/opt/gcc-aarch32-10.3-2021.07/bin/arm-none-linux-gnueabihf- +CROSS_COMPILE=/opt/gcc-aarch32-10.3-2021.07/bin/arm-none-linux-gnueabihf- function msg_banner() @@ -77,12 +77,12 @@ QMAKE_FILE=qtbase/mkspecs/linux-arm-gnueabi-g++/qmake.conf - grep "`dirname ${CROSSTOOL}`" ${QMAKE_FILE} > /dev/null 2>&1 + grep "`dirname ${CROSS_COMPILE}`" ${QMAKE_FILE} > /dev/null 2>&1 if [ $? != 0 ] ; then - sed -i "s|arm-linux-gnueabi-|$CROSSTOOL|" ${QMAKE_FILE} + sed -i "s|arm-linux-gnueabi-|$CROSS_COMPILE|" ${QMAKE_FILE} fi - export CROSS_SYSROOT=`${CROSSTOOL}gcc -print-sysroot` + export CROSS_SYSROOT=`${CROSS_COMPILE}gcc -print-sysroot` ./configure -opensource -confirm-license -release -shared -strip -c++std c++11 \ -extprefix ${QT_INST_PATH} -prefix ${QT_INST_PATH} -sysroot ${CROSS_SYSROOT} -pkg-config \ -- Gitblit v1.9.1