diff --git a/thirdparty/libdash/HPKBUILD b/thirdparty/libdash/HPKBUILD index b7993fdcdf80b1cb48b7b1597e254d0964b418b3..8295c4ee213a214463dc843b3ccda52d69a7e5a6 100644 --- a/thirdparty/libdash/HPKBUILD +++ b/thirdparty/libdash/HPKBUILD @@ -24,21 +24,26 @@ prepare() { cd $builddir # 由于找不到CURL的头文件,因此打补丁 patch -p1 < `pwd`/../libdash_oh_pkg.patch - patchflag=false + patchflag=false cd $OLDPWD fi cd $builddir # 由于原库的libcurl头文件和lycium下的curl的版本不一致导致编译有错误,因此做了拷贝处理,先清掉原库的头文件再拷贝 rm -rf libdash/libcurl/* cp -rf $LYCIUM_ROOT/usr/curl/$ARCH/include libdash/libcurl/include + # 将lib文件夹拷贝过来之后在CMakeLists.txt中设置libcurl.so路径以解决编译时undefined symbol问题 + cp -rf $LYCIUM_ROOT/usr/curl/$ARCH/lib libdash/libcurl/lib cd $OLDPWD mkdir -p $builddir/$ARCH-build } build() { cd $builddir/$pkgname - ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -B`pwd`/../$ARCH-build -S./ -L > `pwd`/../$ARCH-build/build.log 2>&1 - make -j4 -C `pwd`/../$ARCH-build >> `pwd`/../$ARCH-build/build.log 2>&1 + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" \ + -DOPENSSL_CRYPTO_LIBRARY=$LYCIUM_ROOT/usr/openssl/lib \ + -DOPENSSL_INCLUDE_DIR=$LYCIUM_ROOT/usr/openssl/include \ + -DOHOS_ARCH=$ARCH -B`pwd`/../$ARCH-build -S./ -L > $buildlog 2>&1 + $MAKE -C `pwd`/../$ARCH-build >> $buildlog 2>&1 ret=$? cd $OLDPWD return $ret diff --git a/thirdparty/libdash/SHA512SUM b/thirdparty/libdash/SHA512SUM index 8f72c567aaec09d54563bb0610e2cabe92495725..2a93ca7e9ecaea5179050d29939048f35538fc8d 100644 --- a/thirdparty/libdash/SHA512SUM +++ b/thirdparty/libdash/SHA512SUM @@ -1,2 +1,2 @@ 9dd03ff8796495c0959c3967fe58d6d2c1aa2eef3d46c90117adcc783e7c624d6be9070a37bd59d7a35fe5a5f48e39488417c7eeb7e4158da67747e5be52c1d2 libdash-2.2.tar.gz -b1f44a886490e7806b5ab1bfae719bfc4b68126eafc8ca0a0ee8caa1c1868925a0728630c15a259f09241ba18f6f20a688df5fc62c65b9d2dc01e7b427876eb2 libdash_oh_pkg.patch +32245fb0beac58a23c949a3f9ed1f687655e2b7d8231a98809fb09df272db89afee210192576c28f32e1085e6bc773f03875cdaceb2220783be2af02fc13b57b libdash_oh_pkg.patch diff --git a/thirdparty/libdash/libdash_oh_pkg.patch b/thirdparty/libdash/libdash_oh_pkg.patch index bf225c3c7574183337459d72dda46eef0a26878a..f68585fe0dcb9c78055772d95a280556e5baf0db 100644 --- a/thirdparty/libdash/libdash_oh_pkg.patch +++ b/thirdparty/libdash/libdash_oh_pkg.patch @@ -1,15 +1,16 @@ -diff -Naur libdash-2.2/libdash/CMakeLists.txt libdash-2.2-patch/libdash/CMakeLists.txt ---- libdash-2.2/libdash/CMakeLists.txt 2013-04-03 17:40:41.000000000 +0800 -+++ libdash-2.2-patch/libdash/CMakeLists.txt 2023-04-20 19:53:54.739473466 +0800 -@@ -5,10 +5,10 @@ +diff -Nura libdash-2.2/libdash/CMakeLists.txt patch/libdash/CMakeLists.txt +--- libdash-2.2/libdash/CMakeLists.txt 2013-04-03 02:40:41.000000000 -0700 ++++ patch/libdash/CMakeLists.txt 2024-10-23 02:03:40.258801297 -0700 +@@ -5,10 +5,12 @@ include_directories(sdl/include) include_directories(zlib/include) include_directories(iconv/include) -- +include_directories(libcurl/include) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) ++set(CURL_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/libcurl/lib/libcurl.so) add_subdirectory(libdash) -add_subdirectory(libdash_networkpart_test)