mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
[libhdfs3] Fix libhdfs3 to build missing dependent libraries libuuid and libgsasl (#31065)
* fix libhdfs3 build error * update version * fix dependency uuid * update version * fix dependency uuid * update version * fix osx * update version * fix uuid usage on osx * update version --------- Co-authored-by: Jim Wang (Beyondsoft Corporation) <v-wangjim@microsoft.com>
This commit is contained in:
parent
dc141be7ff
commit
9afce05282
25
ports/libhdfs3/fix_dependency_uuid.patch
Normal file
25
ports/libhdfs3/fix_dependency_uuid.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index 1a8b109..6ea24f8 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -21,7 +21,9 @@ FIND_PACKAGE(KERBEROS REQUIRED)
|
||||||
|
FIND_PACKAGE(GSasl REQUIRED)
|
||||||
|
|
||||||
|
IF(OS_LINUX)
|
||||||
|
- FIND_PACKAGE(LibUUID REQUIRED)
|
||||||
|
+ find_package(unofficial-libuuid CONFIG REQUIRED)
|
||||||
|
+ set(LIBUUID_LIBRARIES unofficial::UUID::uuid)
|
||||||
|
+ add_library(uuid ALIAS unofficial::UUID::uuid)
|
||||||
|
ENDIF(OS_LINUX)
|
||||||
|
|
||||||
|
ADD_SUBDIRECTORY(mock)
|
||||||
|
diff --git a/hdfs_benchmark/CMakeLists.txt b/hdfs_benchmark/CMakeLists.txt
|
||||||
|
index dcb4c0a..f4274b6 100644
|
||||||
|
--- a/hdfs_benchmark/CMakeLists.txt
|
||||||
|
+++ b/hdfs_benchmark/CMakeLists.txt
|
||||||
|
@@ -10,4 +10,4 @@ set(SOURCE_FILES main.cpp)
|
||||||
|
add_executable(hdfs_benchmark ${SOURCE_FILES})
|
||||||
|
add_dependencies(hdfs_benchmark libhdfs3-shared)
|
||||||
|
|
||||||
|
-target_link_libraries(hdfs_benchmark uuid pthread libhdfs3-shared)
|
||||||
|
+target_link_libraries(hdfs_benchmark pthread libhdfs3-shared)
|
@ -4,8 +4,25 @@ vcpkg_from_github(
|
|||||||
REF 9a60d79812d6dee72455f61bff57a93c3c7d56f5
|
REF 9a60d79812d6dee72455f61bff57a93c3c7d56f5
|
||||||
SHA512 2b635ab979230c251243f01717105872245d7948f75832e58f50a09b0b06d1b366b3c5f3a3253fa538076e9f199003f28d10b9958293144dbc301276073a0633
|
SHA512 2b635ab979230c251243f01717105872245d7948f75832e58f50a09b0b06d1b366b3c5f3a3253fa538076e9f199003f28d10b9958293144dbc301276073a0633
|
||||||
HEAD_REF apache-rpc-9
|
HEAD_REF apache-rpc-9
|
||||||
|
PATCHES
|
||||||
|
fix_dependency_uuid.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(VCPKG_TARGET_IS_LINUX )
|
||||||
|
message(STATUS [[
|
||||||
|
To build libhdfs3, the following libraries are needed.
|
||||||
|
libgsasl
|
||||||
|
This development package can be installed on the system by
|
||||||
|
apt install libgsasl-dev
|
||||||
|
]])
|
||||||
|
elseif(VCPKG_TARGET_IS_OSX)
|
||||||
|
message(WARNING [[
|
||||||
|
To build libhdfs3, the following libraries are needed.
|
||||||
|
libgsasl
|
||||||
|
These development packages can be installed on the system via
|
||||||
|
git clone https://gitlab.com/gsasl/gsasl.git]])
|
||||||
|
endif()
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
SOURCE_PATH "${SOURCE_PATH}"
|
SOURCE_PATH "${SOURCE_PATH}"
|
||||||
)
|
)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "libhdfs3",
|
"name": "libhdfs3",
|
||||||
"version-date": "2019-11-05",
|
"version-date": "2019-11-05",
|
||||||
"port-version": 4,
|
"port-version": 5,
|
||||||
"description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation",
|
"description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation",
|
||||||
"homepage": "https://github.com/erikmuttersbach/libhdfs3",
|
"homepage": "https://github.com/erikmuttersbach/libhdfs3",
|
||||||
"supports": "!windows",
|
"supports": "!windows",
|
||||||
|
@ -4178,7 +4178,7 @@
|
|||||||
},
|
},
|
||||||
"libhdfs3": {
|
"libhdfs3": {
|
||||||
"baseline": "2019-11-05",
|
"baseline": "2019-11-05",
|
||||||
"port-version": 4
|
"port-version": 5
|
||||||
},
|
},
|
||||||
"libheif": {
|
"libheif": {
|
||||||
"baseline": "1.16.2",
|
"baseline": "1.16.2",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "b7c6b5d79957e7f11f9cc7b0890275edd627606d",
|
||||||
|
"version-date": "2019-11-05",
|
||||||
|
"port-version": 5
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "802dd2510f39b3d717606d2dfa047278e8772ff4",
|
"git-tree": "802dd2510f39b3d717606d2dfa047278e8772ff4",
|
||||||
"version-date": "2019-11-05",
|
"version-date": "2019-11-05",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user