From 75cea0ab7270452e392116ff078197f9b39c7cc2 Mon Sep 17 00:00:00 2001 From: wuguangzhao Date: Tue, 12 Nov 2024 16:32:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dopenmp=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuguangzhao --- thirdparty/openmp/HPKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/thirdparty/openmp/HPKBUILD b/thirdparty/openmp/HPKBUILD index ce7e032c..43691e43 100755 --- a/thirdparty/openmp/HPKBUILD +++ b/thirdparty/openmp/HPKBUILD @@ -32,7 +32,8 @@ prepare() { build() { cd $builddir - cmake "$@" -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 + # LIBOMP_USE_VERSION_SYMBOLS 打开后需要添加-DLIBOMP_LDFLAGS="-Wl,--version-script=`pwd`/runtime/src/exports_so.txt" 才可编译通过 + cmake "$@" -DLIBOMP_USE_VERSION_SYMBOLS=OFF -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 make -j4 -C $ARCH-build VERBOSE=1 >> `pwd`/$ARCH-build/build.log 2>&1 ret=$? cd $OLDPWD -- Gitee From 50a8490ff1224477cffb14b1cc5aeec7ad652b11 Mon Sep 17 00:00:00 2001 From: wuguangzhao Date: Tue, 12 Nov 2024 17:19:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?openmp=E7=BC=96=E8=AF=91=E7=9A=84cmake?= =?UTF-8?q?=E4=BD=BF=E7=94=A8sdk=E4=B8=AD=E7=9A=84cmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuguangzhao --- thirdparty/openmp/HPKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/thirdparty/openmp/HPKBUILD b/thirdparty/openmp/HPKBUILD index 43691e43..abfd261e 100755 --- a/thirdparty/openmp/HPKBUILD +++ b/thirdparty/openmp/HPKBUILD @@ -33,8 +33,8 @@ prepare() { build() { cd $builddir # LIBOMP_USE_VERSION_SYMBOLS 打开后需要添加-DLIBOMP_LDFLAGS="-Wl,--version-script=`pwd`/runtime/src/exports_so.txt" 才可编译通过 - cmake "$@" -DLIBOMP_USE_VERSION_SYMBOLS=OFF -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 - make -j4 -C $ARCH-build VERBOSE=1 >> `pwd`/$ARCH-build/build.log 2>&1 + PKG_CONFIG_LIBDIR="{pkgconfigpath}" ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DLIBOMP_USE_VERSION_SYMBOLS=OFF -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 + $MAKE -C $ARCH-build VERBOSE=1 >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret @@ -42,7 +42,7 @@ build() { package() { cd $builddir - make -C $ARCH-build install VERBOSE=1 >> `pwd`/$ARCH-build/build.log 2>&1 + $MAKE -C $ARCH-build install VERBOSE=1 >> $buildlog 2>&1 cd $OLDPWD } -- Gitee