diff --git a/thirdparty/libxlsxwriter/HPKBUILD b/thirdparty/libxlsxwriter/HPKBUILD index 380b8a8040744ddd7ba1df7b06009c583d2b26cf..11a0f7366f2cac5dc276b227a3753c63f8c326d0 100644 --- a/thirdparty/libxlsxwriter/HPKBUILD +++ b/thirdparty/libxlsxwriter/HPKBUILD @@ -1,7 +1,7 @@ # Contributor: wupingyuan # Maintainer: wupingyuan pkgname=libxlsxwriter -pkgver=RELEASE_1.1.5 +pkgver=1.1.9 pkgrel=0 pkgdesc="Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file." url="https://github.com/jmcnamara/libxlsxwriter" @@ -10,7 +10,7 @@ license=("FreeBSD") depends=("zlib") makedepends=() install= -source="https://github.com/jmcnamara/$pkgname/archive/refs/tags/$pkgver.tar.gz" +source="https://github.com/jmcnamara/$pkgname/archive/refs/tags/v$pkgver.tar.gz" autounpack=true downloadpackage=true @@ -23,8 +23,8 @@ prepare() { build() { cd $builddir - PKG_CONFIG_LIBDIR="${pkgconfigpath}" cmake "$@" -DOHOS_ARCH=$ARCH -DZLIB_ROOT="$LYCIUM_ROOT/usr/zlib/$ARCH" -DBUILD_TESTS=ON -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 - make -j4 -C $ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1 + PKG_CONFIG_LIBDIR="${pkgconfigpath}" cmake "$@" -DOHOS_ARCH=$ARCH -DZLIB_ROOT="$LYCIUM_ROOT/usr/zlib/$ARCH" -DBUILD_TESTS=ON -B$ARCH-build -S./ -L > $buildlog 2>&1 + $MAKE -C $ARCH-build >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret @@ -32,7 +32,7 @@ build() { package() { cd $builddir - make -C $ARCH-build install >> `pwd`/$ARCH-build/build.log 2>&1 + $MAKE -C $ARCH-build install >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret diff --git a/thirdparty/libxlsxwriter/HPKCHECK b/thirdparty/libxlsxwriter/HPKCHECK index c4d54103fe1654a972c7369e924b6717b57eec93..5832d2758eff122073408dbe4ec1852a7c13a819 100644 --- a/thirdparty/libxlsxwriter/HPKCHECK +++ b/thirdparty/libxlsxwriter/HPKCHECK @@ -6,7 +6,8 @@ logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_ openharmonycheck() { res=0 cd ${builddir}/${ARCH}-build - ctest > ${logfile} 2>&1 + ingore_test="functional" + ctest -E $ingore_test > ${logfile} 2>&1 res=$? if [ $res -ne 0 ] then diff --git a/thirdparty/libxlsxwriter/SHA512SUM b/thirdparty/libxlsxwriter/SHA512SUM index c5c057127c6717b4e937840871efe8e6fbaa515e..91b0c44da07caf0396b572175abb5a0706f30e4b 100644 --- a/thirdparty/libxlsxwriter/SHA512SUM +++ b/thirdparty/libxlsxwriter/SHA512SUM @@ -1 +1 @@ -bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6 libxlsxwriter-RELEASE_1.1.5.tar.gz \ No newline at end of file +b1d5827e5cfc4f455eaf48b181c26d7642d0a65d261a068c1123ff49b2fa1aedd8c2a716b7915803c861973b1de286e49e1761c2e5a523e7c0ba353f5994d48d libxlsxwriter-1.1.9.tar.gz \ No newline at end of file