From fe07010da298a9898f7ea09ffe2fd27cbb46a981 Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Wed, 6 Nov 2024 16:37:42 +0800
Subject: [PATCH] =?UTF-8?q?fribidi=E5=BA=93=E7=9A=84hpkbuild=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E4=BE=9D=E8=B5=96=E5=92=8C=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/fribidi/HPKBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/thirdparty/fribidi/HPKBUILD b/thirdparty/fribidi/HPKBUILD
index fe7b5948..b0548fa3 100644
--- a/thirdparty/fribidi/HPKBUILD
+++ b/thirdparty/fribidi/HPKBUILD
@@ -22,7 +22,7 @@ url="https://github.com/fribidi/fribidi"
 archs=("armeabi-v7a" "arm64-v8a")
 license=("LGPL-2.1-only")
 depends=()
-makedepends=("unzip")
+makedepends=("unzip" "yacc" "flex")
 # 原仓地址: https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz, 因网络原因使用镜像
 source="https://gitee.com/mirrors/$pkgname/repository/archive/$pkgver.zip"
 
@@ -49,10 +49,10 @@ prepare() {
         then
             return -1
         fi
-        unzip c2man.zip > `pwd`/build.log 2>&1
+        unzip c2man.zip > $buildlog 2>&1
         cd c2man-master
-        ./Configure -d -e > `pwd`/build.log 2>&1
-        $MAKE >> `pwd`/build.log 2>&1
+        PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./Configure -d -e > $buildlog 2>&1
+        $MAKE VERBOSE=1 >> $buildlog 2>&1
         cd $OLDPWD
         buildhostc2man=false
     fi
@@ -73,7 +73,7 @@ prepare() {
     if $autogenflag
     then
         cd $builddir
-        ./autogen.sh > `pwd`/build.log 2>&1
+        ./autogen.sh > $buildlog 2>&1
         autogenflag=false
         cd $OLDPWD
     fi
@@ -82,8 +82,9 @@ prepare() {
 
 build() {
     cd $builddir/$ARCH-build
-    ../configure "$@" --host=$host --enable-static > $buildlog 2>&1
-    $MAKE >> $buildlog 2>&1
+    PKG_CONFIG_LIBDIR="${pkgconfigpath}" ../configure "$@" \
+        --host=$host --enable-static > $buildlog 2>&1
+    $MAKE VERBOSE=1 >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -97,7 +98,7 @@ package() {
 
 check() {
     cd $builddir/$ARCH-build
-    $MAKE -C test/unicode-conformance BidiTest BidiCharacterTest >> $buildlog 2>&1
+    $MAKE VERBOSE=1 -C test/unicode-conformance BidiTest BidiCharacterTest >> $buildlog 2>&1
     ret=$?
     if [ $ARCH == "armeabi-v7a" ]
     then
-- 
Gitee