From e106014d36654199257e27a5818f15f264e1e2f7 Mon Sep 17 00:00:00 2001
From: yyy-xxx <yaoxingyu001@chinasoftinc.com>
Date: Mon, 19 Aug 2024 11:03:08 +0800
Subject: [PATCH] =?UTF-8?q?libgphoto2=E9=92=88=E5=AF=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=9B=B4=E6=96=B0=E4=BA=86HPKBUILD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yyy-xxx <yaoxingyu001@chinasoftinc.com>
---
 thirdparty/libgphoto2/HPKBUILD | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/thirdparty/libgphoto2/HPKBUILD b/thirdparty/libgphoto2/HPKBUILD
index e450a37c..588fb168 100644
--- a/thirdparty/libgphoto2/HPKBUILD
+++ b/thirdparty/libgphoto2/HPKBUILD
@@ -105,7 +105,7 @@ prepare() {
 
 build() {
     cd $builddir-$ARCH-build
-    ./configure "$@" --host=$host \
+    PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --host=$host \
         CPPFLAGS="-I${LYCIUM_ROOT}/usr/libtool/${ARCH}/include -I${LYCIUM_ROOT}/usr/jpeg/${ARCH}/include \
             -I${LYCIUM_ROOT}/usr/libxml2/${ARCH}/include" \
         LDFLAGS="-L${LYCIUM_ROOT}/usr/libtool/${ARCH}/lib -L${LYCIUM_ROOT}/usr/jpeg/${ARCH}/lib \
@@ -142,6 +142,11 @@ check() {
         return -1
     fi
     echo "The test must be on an OpenHarmony device!"
+    # 修改测试目录下的工具路径:/usr/bin/sed -> /data/CIusr/bin/sed ; /bin/bash -> /data/CIusr/bin/bash
+    cd $builddir-$ARCH-build/tests    
+    sed -i "s#/usr/bin/sed#/data/CIusr/bin/sed#g" `grep -rn "/usr/bin/sed" | awk -F ':' '{print $1}'  | sort -u`
+    sed -i "s#/bin/bash#/data/CIusr/bin/bash#g" `grep -rn "/bin/bash" | awk -F ':' '{print $1}' | sort -u`
+    cd $OLDPWD
     # real test CMD
     # make check-TESTS
 }
@@ -161,4 +166,4 @@ recoverpkgbuildenv() {
 # 清理环境
 cleanbuild(){
     rm -rf ${PWD}/$builddir ${PWD}/$builddir-armeabi-v7a-build ${PWD}/$builddir-arm64-v8a-build #${PWD}/$packagename
-}
\ No newline at end of file
+}
-- 
Gitee