From 8b85f321e26a23099e8a2e4c96c92a610b9529a2 Mon Sep 17 00:00:00 2001 From: lxh Date: Fri, 8 Nov 2024 16:01:38 +0800 Subject: [PATCH] =?UTF-8?q?hunspell=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/hunspell/HPKBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/thirdparty/hunspell/HPKBUILD b/thirdparty/hunspell/HPKBUILD index e12c1a46..4010912d 100644 --- a/thirdparty/hunspell/HPKBUILD +++ b/thirdparty/hunspell/HPKBUILD @@ -8,7 +8,8 @@ url="" archs=("armeabi-v7a" "arm64-v8a") license="LGPL-2.1 GPL-2.0" depends=() -makedepends=() +#没安装libtool这个库会编译失败 +makedepends=("autopoint") install= source="https://github.com/hunspell/$pkgname/archive/refs/tags/$pkgver.tar.gz" @@ -36,18 +37,18 @@ prepare() { export LDFLAGS="${OHOS_SDK}/native/llvm/lib/clang/${CLANG_VERSION}/lib/aarch64-linux-ohos/libclang_rt.builtins.a ${LDFLAGS}" fi cd $builddir-$ARCH-build - autoreconf -ifv > `pwd`/build.log 2>&1 + autoreconf -ifv > $buildlog 2>&1 cd $OLDPWD } build() { cd $builddir-$ARCH-build - ./configure "$@" --host=$host >> `pwd`/build.log 2>&1 + PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --host=$host >> $buildlog 2>&1 # 修改/bin/bash和/usr/bin/sed find . -name Makefile -exec sed -i 's#/bin/bash#bash#' {} + find . -name Makefile -exec sed -i 's#/usr/bin/sed#/bin/sed#' {} + find . -name Makefile -exec sed -i 's#mawk#awk#' {} + - make -j4 >> `pwd`/build.log 2>&1 + $MAKE VERBOSE=1 >> $buildlog 2>&1 sed -i 's#/bin/bash#/bin/env bash#' libtool src/tools/hunspell src/tools/analyze tests/test.sh sed -i 's#/usr/bin/sed#/bin/sed#' libtool src/tools/hunspell src/tools/analyze ret=$? @@ -57,7 +58,7 @@ build() { package() { cd $builddir-$ARCH-build - make install >> `pwd`/build.log 2>&1 + $MAKE VERBOSE=1 install >> $buildlog 2>&1 cd $OLDPWD if [ $ARCH == ${archs[0]} ] then -- Gitee