From 4f223f3d7129e9bb1aa523b05b8ab42e39b5253a Mon Sep 17 00:00:00 2001
From: yaoxingyu <yaoxingyu7@h-partners.com>
Date: Thu, 7 Nov 2024 14:23:56 +0800
Subject: [PATCH] update HPKBUILD format of marisa-trie

Signed-off-by: yaoxingyu <yaoxingyu7@h-partners.com>
---
 thirdparty/marisa-trie/HPKBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/thirdparty/marisa-trie/HPKBUILD b/thirdparty/marisa-trie/HPKBUILD
index 50e8dccb..b5afafcf 100644
--- a/thirdparty/marisa-trie/HPKBUILD
+++ b/thirdparty/marisa-trie/HPKBUILD
@@ -35,14 +35,14 @@ prepare() {
         export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/${CLANG_VERSION}/lib/aarch64-linux-ohos/libclang_rt.builtins.a ${LDFLAGS}"
     fi
     cd $builddir-$ARCH-build
-    autoreconf -i > ./build.log 2>&1
+    autoreconf -i > $publicbuildlog 2>&1
     cd $OLDPWD
 }
 
 build() {
     cd $builddir-$ARCH-build
-    ./configure "$@" --host=$host >> ./build.log 2>&1
-    make -j4 >> `pwd`/build.log 2>&1
+    PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --host=$host > $buildlog 2>&1
+    $MAKE VERBOSE=1 >> $buildlog 2>&1
     ret=$?
 
     cd $OLDPWD
@@ -51,7 +51,7 @@ build() {
 
 package() {
     cd $builddir-$ARCH-build
-    make install >> ./build.log 2>&1
+    $MAKE install >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -60,7 +60,7 @@ package() {
 check() {
     cd $builddir-$ARCH-build/tests
     ## 编译出测试应用
-    make base-test io-test vector-test trie-test marisa-test >> ../build.log 2>&1
+    $MAKE base-test io-test vector-test trie-test marisa-test >> $buildlog 2>&1
     ret=$?
     ## 修改测试条件， 使测试时不在进行编译操作
     sed -i "s/check-TESTS: \$(check_PROGRAMS)/check-TESTS: # \$(check_PROGRAMS)/" Makefile
-- 
Gitee