From 0ece930c33edbb8d10877a25a5c1df88f2cfc778 Mon Sep 17 00:00:00 2001 From: lxh Date: Fri, 15 Nov 2024 18:31:56 +0800 Subject: [PATCH] =?UTF-8?q?icu=E5=BA=93=E7=9A=84hpkbuild=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lxh --- thirdparty/icu/HPKBUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/thirdparty/icu/HPKBUILD b/thirdparty/icu/HPKBUILD index ec5d686b..06785b7f 100644 --- a/thirdparty/icu/HPKBUILD +++ b/thirdparty/icu/HPKBUILD @@ -42,10 +42,10 @@ prepare() { if [ $buildhost == true ];then mkdir -p $builddir/host-build cd $builddir/host-build - CXXFLAGS="-std=c++11 -DU_USING_ICU_NAMESPACE=0" ../icu4c/source/runConfigureICU Linux/gcc > `pwd`/build.log 2>&1 - make -j4 VERBOSE=1 >> `pwd`/build.log 2>&1 + CXXFLAGS="-std=c++11 -DU_USING_ICU_NAMESPACE=0" ../icu4c/source/runConfigureICU Linux/gcc > $buildlog 2>&1 + $MAKE VERBOSE=1 >> $buildlog 2>&1 if [ $? -ne 0 ];then - cat config.log >> `pwd`/build.log 2>&1 + cat config.log >> $buildlog 2>&1 return -2 fi buildhost=false @@ -67,8 +67,10 @@ prepare() { build() { cd $builddir/$ARCH-build - CXXFLAGS="$CXXFLAGS -std=c++11 -DU_USING_ICU_NAMESPACE=0" ../icu4c/source/configure "$@" --host=$host --with-cross-build=`pwd`/../host-build > `pwd`/build.log 2>&1 - make -j4 VERBOSE=1 >> `pwd`/build.log 2>&1 + CXXFLAGS="$CXXFLAGS -std=c++11 -DU_USING_ICU_NAMESPACE=0" \ + PKG_CONFIG_LIBDIR="${pkgconfigpath}" ../icu4c/source/configure "$@" \ + --host=$host --with-cross-build=`pwd`/../host-build > $buildlog 2>&1 + $MAKE VERBOSE=1 >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret -- Gitee