diff --git a/thirdparty/libxlsxwriter/HPKBUILD b/thirdparty/libxlsxwriter/HPKBUILD index 380b8a8040744ddd7ba1df7b06009c583d2b26cf..a007f8717ccae07e2419d6661fcee8ac6d6c7761 100644 --- a/thirdparty/libxlsxwriter/HPKBUILD +++ b/thirdparty/libxlsxwriter/HPKBUILD @@ -16,15 +16,26 @@ autounpack=true downloadpackage=true builddir=$pkgname-$pkgver packagename=$builddir.tar.gz +patchflag=true prepare() { mkdir -p $builddir/$ARCH-build + if [ $patchflag == true ] + then + cd $builddir + # 更新对zlib库的版本要求 + patch -p1 < ../libxlsxwriter_oh_pkg.patch + patchflag=false + cd $OLDPWD + fi } 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 "$@" \ + -DZLIB_ROOT="$LYCIUM_ROOT/usr/zlib/$ARCH" \ + -DOHOS_ARCH=$ARCH -DBUILD_TESTS=ON -B$ARCH-build -S./ -L > $buildlog 2>&1 + $MAKE -C $ARCH-build VERBOSE=1 >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret @@ -32,7 +43,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/SHA512SUM b/thirdparty/libxlsxwriter/SHA512SUM index c5c057127c6717b4e937840871efe8e6fbaa515e..83407461296ca5d45053fcb4ded0eb7e52c5a451 100644 --- a/thirdparty/libxlsxwriter/SHA512SUM +++ b/thirdparty/libxlsxwriter/SHA512SUM @@ -1 +1,2 @@ -bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6 libxlsxwriter-RELEASE_1.1.5.tar.gz \ No newline at end of file +bd7db0fcf25ebf492b4d8f7da8fdb6cc79400d7d0fa5856ddae259cb24817034fc97d4828cbde42434f41198dcfb6732ac63c756abd962689f4249ca64bf19c6 libxlsxwriter-RELEASE_1.1.5.tar.gz +a422c01bcc4bc3e94238db29b8c1cdc0e93f3d8fb93133cea34e4a6de1df7b8e946616426a5ca53e630c0e38fbb93bbcade9f15e33e510b8212fa133175074c1 libxlsxwriter_oh_pkg.patch diff --git a/thirdparty/libxlsxwriter/libxlsxwriter_oh_pkg.patch b/thirdparty/libxlsxwriter/libxlsxwriter_oh_pkg.patch new file mode 100644 index 0000000000000000000000000000000000000000..e1f1c1c82989d1c31c7a3677efe7f688f6188e52 --- /dev/null +++ b/thirdparty/libxlsxwriter/libxlsxwriter_oh_pkg.patch @@ -0,0 +1,12 @@ +diff -Nura libxlsxwriter-RELEASE_1.1.5/CMakeLists.txt patch/CMakeLists.txt +--- libxlsxwriter-RELEASE_1.1.5/CMakeLists.txt 2022-12-30 07:25:10.000000000 -0800 ++++ patch/CMakeLists.txt 2024-11-11 23:32:31.799840842 -0800 +@@ -219,7 +219,7 @@ + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + # ZLIB +-find_package(ZLIB REQUIRED "1.0") ++find_package(ZLIB REQUIRED) + list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS}) + message("zlib version: " ${ZLIB_VERSION}) +