From 3c1b619a57335670c1806f10a200d893d4a0604a Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Mon, 11 Nov 2024 16:03:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?aubio=E5=BA=93=E7=9A=84hpkbuild=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8Chpkcheck=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0L?=
 =?UTF-8?q?D=5FLIBRARY=5FPATH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/aubio/HPKBUILD | 4 ++--
 thirdparty/aubio/HPKCHECK | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/thirdparty/aubio/HPKBUILD b/thirdparty/aubio/HPKBUILD
index 2a25709d..54af8cdb 100644
--- a/thirdparty/aubio/HPKBUILD
+++ b/thirdparty/aubio/HPKBUILD
@@ -77,7 +77,7 @@ prepare() {
 
 build() {
     cd $builddir-${ARCH}-build
-    $MAKE build LIB="$ar cr" CC="$cc" > $buildlog 2>&1
+    $MAKE VERBOSE=1 build LIB="$ar cr" CC="$cc" > $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -85,7 +85,7 @@ build() {
 
 package() {
     cd $builddir-${ARCH}-build
-    $MAKE install >> $buildlog 2>&1
+    $MAKE VERBOSE=1 install >> $buildlog 2>&1
     ret=$?
     
     install_dir=${LYCIUM_ROOT}/usr/${pkgname}/${ARCH}
diff --git a/thirdparty/aubio/HPKCHECK b/thirdparty/aubio/HPKCHECK
index 9f048880..e0f0bd7e 100644
--- a/thirdparty/aubio/HPKCHECK
+++ b/thirdparty/aubio/HPKCHECK
@@ -16,7 +16,7 @@
 
 source HPKBUILD > /dev/null 2>&1
 logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log
-
+export LD_LIBRARY_PATH=/data/tpc_c_cplusplus/thirdparty/${pkgname}/${pkgname}-${commitid}-${ARCH}-build/build/dist/usr/local/lib64/:$LD_LIBRARY_PATH
 openharmonycheck() {
     res=0
     cd $builddir-${ARCH}-build/build/examples
-- 
Gitee


From 15addbdc265fcd1f397e192dd8716f73296ca20b Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Tue, 12 Nov 2024 17:59:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1.aubio=E5=BA=93=E7=9A=84hpkbuild=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=202.=E4=BB=A3=E7=A0=81=E4=B8=8B=E8=BD=BD=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=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/aubio/HPKBUILD | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/thirdparty/aubio/HPKBUILD b/thirdparty/aubio/HPKBUILD
index 54af8cdb..6d054107 100644
--- a/thirdparty/aubio/HPKBUILD
+++ b/thirdparty/aubio/HPKBUILD
@@ -23,7 +23,7 @@ archs=("armeabi-v7a" "arm64-v8a")
 license=("GPL-3.0-only")
 depends=()
 makedepends=()
-
+source="https://gitee.com/lycium_pkg_mirror/$pkgname.git"
 commitid=152d6819b360c2e7b379ee3f373d444ab3df0895
 builddir=${pkgname}-${commitid}
 packagename=
@@ -37,10 +37,11 @@ cc=
 ar=
 
 source envset.sh
-
+#编译前要建立python的软链接，sudo ln -s /usr/bin/python3 /usr/bin/python
 prepare() {
     if [ $clonesrcflag == true ]; then
-        git clone https://github.com/$pkgname/$pkgname.git $builddir > $publicbuildlog 2>&1
+        mkdir -p $builddir
+        git clone -b $pkgver $source $builddir > $publicbuildlog 2>&1 
         if [ $? -ne 0 ]; then
             return -1
         fi
@@ -77,7 +78,7 @@ prepare() {
 
 build() {
     cd $builddir-${ARCH}-build
-    $MAKE VERBOSE=1 build LIB="$ar cr" CC="$cc" > $buildlog 2>&1
+    $MAKE build LIB="$ar cr" CC="$cc" > $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -85,7 +86,7 @@ build() {
 
 package() {
     cd $builddir-${ARCH}-build
-    $MAKE VERBOSE=1 install >> $buildlog 2>&1
+    $MAKE install >> $buildlog 2>&1
     ret=$?
     
     install_dir=${LYCIUM_ROOT}/usr/${pkgname}/${ARCH}
-- 
Gitee


From 50ff72b6cabac2781aadf44f407b2828583b0958 Mon Sep 17 00:00:00 2001
From: lxh <liangxiaohui3@h-partners.com>
Date: Thu, 14 Nov 2024 08:43:35 +0000
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA$builddir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lxh <liangxiaohui3@h-partners.com>
---
 thirdparty/aubio/HPKCHECK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/thirdparty/aubio/HPKCHECK b/thirdparty/aubio/HPKCHECK
index e0f0bd7e..60540495 100644
--- a/thirdparty/aubio/HPKCHECK
+++ b/thirdparty/aubio/HPKCHECK
@@ -16,7 +16,7 @@
 
 source HPKBUILD > /dev/null 2>&1
 logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log
-export LD_LIBRARY_PATH=/data/tpc_c_cplusplus/thirdparty/${pkgname}/${pkgname}-${commitid}-${ARCH}-build/build/dist/usr/local/lib64/:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/data/tpc_c_cplusplus/thirdparty/${pkgname}/${builddir}-${ARCH}-build/build/dist/usr/local/lib64/:$LD_LIBRARY_PATH
 openharmonycheck() {
     res=0
     cd $builddir-${ARCH}-build/build/examples
-- 
Gitee