From 30ce2ed640438155ff9d72bc80f3f1b89970e03b Mon Sep 17 00:00:00 2001
From: zhongluping <278527840@qq.com>
Date: Thu, 11 May 2023 15:12:28 +0800
Subject: [PATCH] update tools

Signed-off-by: zhongluping <278527840@qq.com>
---
 docs/thirdparty_list.md   |  8 ++++++++
 tools/build.sh            | 17 ++++++++++++-----
 tools/script/build_hpk.sh |  2 +-
 tools/script/envset.sh    |  8 ++++----
 4 files changed, 25 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 tools/build.sh
 mode change 100755 => 100644 tools/script/build_hpk.sh
 mode change 100755 => 100644 tools/script/envset.sh

diff --git a/docs/thirdparty_list.md b/docs/thirdparty_list.md
index 03e80730..55c8ea81 100755
--- a/docs/thirdparty_list.md
+++ b/docs/thirdparty_list.md
@@ -36,4 +36,12 @@
 | [WavPack](../thirdparty/WavPack/README_zh.md)                | BSD 3-Clause "New" or "Revised" License       |      | 是   |
 | [libsrtp](../thirdparty/libsrtp/README_zh.md)                | Copyright (c) 2001-2017 Cisco Systems         |      | 是   |
 | [log4cplus](../thirdparty/log4cplus/README_zh.md)            | BSD 2.0/Apache 2.0                            |      | 是   |
+| [zxing-cpp](../thirdparty/zxing-cpp/README_zh.md)            | Apache License 2.0                            |      | 是   |
+| [libsvm](../thirdparty/libsvm/README_zh.md)                  | BSD                                           |      | 是   |
+| [geos](../thirdparty/geos/README_zh.md)                      | LGPL v2.1                                     |      | 是   |
+| [jbig2dec](../thirdparty/jbig2dec/README_zh.md)              | GPLv3                                         |      | 是   |
+| [faad2](../thirdparty/faad2/README_zh.md)                    | GPLv2                                         |      | 是   |
+| [libxls](../thirdparty/libxls/README_zh.md)                  | BSD                                           |      | 是   |
+| [libtess2](../thirdparty/libtess2/README_zh.md)              | SGI FREE SOFTWARE LICENSE B                   |      | 是   |
+| [djvulibre](../thirdparty/djvulibre/README_zh.md)            | GPLv2                                         |      | 是   |
 
diff --git a/tools/build.sh b/tools/build.sh
old mode 100755
new mode 100644
index 6df91452..5f4882bb
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -28,35 +28,42 @@ jobFlag=true
 checkbuildenv(){
     if [ -z ${OHOS_SDK} ]
     then
-        echo "OHOS_SDK 未设置，请先下载安装ohos SDK，并设置OHOS_SDK环境变量。"
+        echo "OHOS_SDK 未设置, 请先下载安装ohos SDK, 并设置OHOS_SDK环境变量. "
         exit 1
     fi
     echo "OHOS_SDK="${OHOS_SDK}
     which cmake >/dev/null 2>&1
     if [ $? -ne 0 ]
     then
-        echo "cmake 命令未安装，请先安装jq命令"
+        echo "cmake 命令未安装, 请先安装 cmake 命令"
         exit 1
     fi
     echo "cmake 命令已安装"
     which make >/dev/null 2>&1
     if [ $? -ne 0 ]
     then
-        echo "make 命令未安装，请先安装jq命令"
+        echo "make 命令未安装. 请先安装 make 命令"
         exit 1
     fi
     echo "make 命令已安装"
+    which pkg-config >/dev/null 2>&1
+    if [ $? -ne 0 ]
+    then
+        echo "pkg-config 命令未安装, 请先安装 pkg-config 命令"
+        exit 1
+    fi
+    echo "pkg-config 命令已安装"
     which autoreconf >/dev/null 2>&1
     if [ $? -ne 0 ]
     then
-        echo "autoreconf 命令未安装，请先安装jq命令"
+        echo "autoreconf 命令未安装, 请先安装 autoreconf 命令"
         exit 1
     fi
     echo "autoreconf 命令已安装"
     which patch >/dev/null 2>&1
     if [ $? -ne 0 ]
     then
-        echo "patch 命令未安装，请先安装jq命令"
+        echo "patch 命令未安装, 请先安装 patch 命令"
         exit 1
     fi
     echo "patch 命令已安装"
diff --git a/tools/script/build_hpk.sh b/tools/script/build_hpk.sh
old mode 100755
new mode 100644
index 08c7f658..be274b22
--- a/tools/script/build_hpk.sh
+++ b/tools/script/build_hpk.sh
@@ -105,7 +105,7 @@ recordbuildlibs() {
 buildargs=
 pkgconfigpath=
 cmakedependpath() {
-    buildargs="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_TOOLCHAIN_FILE=${OHOS_SDK}/native/build/cmake/ohos.toolchain.cmake -DCMAKE_INSTALL_PREFIX=$LYCIUM_ROOT/usr/$pkgname/$1 -G \"Unix Makefiles\" "
+    buildargs="-DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${OHOS_SDK}/native/build/cmake/ohos.toolchain.cmake -DCMAKE_INSTALL_PREFIX=$LYCIUM_ROOT/usr/$pkgname/$1 -G \"Unix Makefiles\" "
     pkgconfigpath=""
     if [ ${#depends[@]} -ne 0 ] 
     then
diff --git a/tools/script/envset.sh b/tools/script/envset.sh
old mode 100755
new mode 100644
index 485746e0..30ae0e07
--- a/tools/script/envset.sh
+++ b/tools/script/envset.sh
@@ -11,8 +11,8 @@ setarm32ENV(){
     export OBJCOPY=${OHOS_SDK}/native/llvm/bin/llvm-objcopy
     export NM=${OHOS_SDK}/native/llvm/bin/llvm-nm
     export AR=${OHOS_SDK}/native/llvm/bin/llvm-ar
-    export CFLAGS="-fPIC -march=armv7a -D__MUSL__=1"
-    export CXXFLAGS="-fPIC -march=armv7a -D__MUSL__=1"
+    export CFLAGS="-DOHOS_NDK -fPIC -march=armv7a -D__MUSL__=1"
+    export CXXFLAGS="-DOHOS_NDK -fPIC -march=armv7a -D__MUSL__=1"
     export LDFLAGS=""
 }
 
@@ -31,8 +31,8 @@ setarm64ENV(){
     export OBJCOPY=${OHOS_SDK}/native/llvm/bin/llvm-objcopy
     export NM=${OHOS_SDK}/native/llvm/bin/llvm-nm
     export AR=${OHOS_SDK}/native/llvm/bin/llvm-ar
-    export CFLAGS="-fPIC -D__MUSL__=1"
-    export CXXFLAGS="-fPIC -D__MUSL__=1"
+    export CFLAGS="-DOHOS_NDK -fPIC -D__MUSL__=1"
+    export CXXFLAGS="-DOHOS_NDK -fPIC -D__MUSL__=1"
     export LDFLAGS=""
 }
 
-- 
Gitee