From daf387eecba6050f8c868e4c1c8a7075c74d879a Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Tue, 12 Nov 2024 17:14:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.darts-clone=E5=BA=93=E7=9A=84hpkbuild?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=202.=E4=BB=A3=E7=A0=81=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=94=B9=E4=B8=BAgit=20clone?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/darts-clone/HPKBUILD | 37 ++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/thirdparty/darts-clone/HPKBUILD b/thirdparty/darts-clone/HPKBUILD
index 6192bed6..97bdcb89 100644
--- a/thirdparty/darts-clone/HPKBUILD
+++ b/thirdparty/darts-clone/HPKBUILD
@@ -23,19 +23,36 @@ archs=("armeabi-v7a" "arm64-v8a")
 license=("BSD 2-clause license")
 depends=()
 makedepends=("automake" "autoconf")
-
-commitid=e40ce4627526985a7767444b6ed6893ab6ff8983
-source="https://github.com/s-yata/darts-clone/archive/${commitid}.zip"
-downloadpackage=true
-autounpack=true
+source="https://gitee.com/lycium_pkg_mirror/$pkgname.git"
+downloadpackage=false
+autounpack=false
 buildtools=configure
-
-builddir=${pkgname}-${commitid}
+builddir=${pkgname}-master
 packagename=$builddir.zip
 
+commitid=e40ce4627526985a7767444b6ed6893ab6ff8983
+cloneflag=true
 source envset.sh
 host=
 prepare() {
+    if [ $cloneflag == true ]
+    then
+        mkdir $builddir
+        git clone -b $pkgver $source $builddir > $publicbuildlog 2>&1 
+        if [ $? != 0 ]
+        then
+            return -1
+        fi
+        cd $builddir
+        git reset --hard $commitid > $publicbuildlog 2>&1 
+        if [ $? != 0 ]
+        then
+            return -1
+        fi
+        cd ..
+        cloneflag=false
+    fi
+
     cp -rf $builddir $pkgname-$ARCH-build
     if [ $ARCH == "armeabi-v7a" ]
     then
@@ -72,8 +89,8 @@ prepare() {
 
 build() {
     cd $pkgname-$ARCH-build  
-    ./configure "$@" --host=$host > `pwd`/build.log 2>&1
-    ${MAKE} VERBOSE=1 >> `pwd`/build.log 2>&1
+    PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --host=$host > $buildlog 2>&1
+    ${MAKE} VERBOSE=1 >> $buildlog 2>&1
     # 对最关键一步的退出码进行判断
     ret=$?
     cd $OLDPWD
@@ -82,7 +99,7 @@ build() {
 
 package() {
     cd $pkgname-$ARCH-build
-    ${MAKE} install >> `pwd`/build.log 2>&1
+    ${MAKE} VERBOSE=1 install >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     if [ $ARCH == "armeabi-v7a" ]
-- 
Gitee


From 8e731b037dea82913cdf03253e970df584ac9b98 Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Thu, 14 Nov 2024 07:12:55 +0000
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=B8=8A?=
 =?UTF-8?q?=E5=B1=82=E6=94=B9=E4=B8=BAOLDPWD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/darts-clone/HPKBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/thirdparty/darts-clone/HPKBUILD b/thirdparty/darts-clone/HPKBUILD
index 97bdcb89..2bbe0814 100644
--- a/thirdparty/darts-clone/HPKBUILD
+++ b/thirdparty/darts-clone/HPKBUILD
@@ -28,7 +28,6 @@ downloadpackage=false
 autounpack=false
 buildtools=configure
 builddir=${pkgname}-master
-packagename=$builddir.zip
 
 commitid=e40ce4627526985a7767444b6ed6893ab6ff8983
 cloneflag=true
@@ -49,7 +48,7 @@ prepare() {
         then
             return -1
         fi
-        cd ..
+        cd $OLDPWD
         cloneflag=false
     fi
 
-- 
Gitee