forked from daphne-eu/daphne
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DAPHNE-daphne-eu#767] libhdfs3 + dependencies
This commit adds the necessary packages for the container scripts and code in the build script to build the dependencies for HDFS support. Co-authored-by: Mark Dokter <[email protected]>
- Loading branch information
1 parent
c1fb18d
commit 7470486
Showing
7 changed files
with
135 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,3 +30,4 @@ openMPIVersion=4.1.5 | |
papiVersion=7.0.1 | ||
spdlogVersion=1.11.0 | ||
ubuntuVersion=24.04 | ||
hawqVersion=3.0.0.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/depends/libhdfs3/CMake/Platform.cmake b/depends/libhdfs3/CMake/Platform.cmake | ||
index ea00fa3f..55fbf646 100644 | ||
--- a/depends/libhdfs3/CMake/Platform.cmake | ||
+++ b/depends/libhdfs3/CMake/Platform.cmake | ||
@@ -16,7 +16,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX) | ||
STRING(REGEX MATCHALL "[0-9]+" GCC_COMPILER_VERSION ${GCC_COMPILER_VERSION}) | ||
|
||
LIST(GET GCC_COMPILER_VERSION 0 GCC_COMPILER_VERSION_MAJOR) | ||
- LIST(GET GCC_COMPILER_VERSION 1 GCC_COMPILER_VERSION_MINOR) | ||
+ LIST(GET GCC_COMPILER_VERSION 0 GCC_COMPILER_VERSION_MINOR) | ||
|
||
SET(GCC_COMPILER_VERSION_MAJOR ${GCC_COMPILER_VERSION_MAJOR} CACHE INTERNAL "gcc major version") | ||
SET(GCC_COMPILER_VERSION_MINOR ${GCC_COMPILER_VERSION_MINOR} CACHE INTERNAL "gcc minor version") | ||
diff --git a/depends/libhdfs3/CMakeLists.txt b/depends/libhdfs3/CMakeLists.txt | ||
index f49e68dc..b96603d2 100644 | ||
--- a/depends/libhdfs3/CMakeLists.txt | ||
+++ b/depends/libhdfs3/CMakeLists.txt | ||
@@ -22,8 +22,8 @@ FIND_PACKAGE(LibXml2 REQUIRED) | ||
FIND_PACKAGE(Protobuf REQUIRED) | ||
FIND_PACKAGE(KERBEROS REQUIRED) | ||
FIND_PACKAGE(GSasl REQUIRED) | ||
-FIND_PACKAGE(GoogleTest REQUIRED) | ||
-INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR}) | ||
+#FIND_PACKAGE(GoogleTest REQUIRED) | ||
+#INCLUDE_DIRECTORIES(${GoogleTest_INCLUDE_DIR}) | ||
LINK_LIBRARIES(${GoogleTest_LIBRARIES}) | ||
|
||
IF(OS_LINUX) |
40 changes: 40 additions & 0 deletions
40
thirdparty/patches/0006-libhdfs3-add-cstdint-include.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
--- hawq-rel-v3.0.0.0/depends/libhdfs3/src/rpc/RpcServerInfo.h.orig 2024-09-11 15:11:43.190472355 +0200 | ||
+++ hawq-rel-v3.0.0.0/depends/libhdfs3/src/rpc/RpcServerInfo.h 2024-09-09 16:00:30.659750184 +0200 | ||
@@ -24,6 +24,7 @@ | ||
|
||
#include "Hash.h" | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
#include <sstream> | ||
|
||
--- hawq-rel-v3.0.0.0/depends/libhdfs3/src/server/DatanodeInfo.h.orig 2024-09-12 18:02:36.241330171 +0200 | ||
+++ hawq-rel-v3.0.0.0/depends/libhdfs3/src/server/DatanodeInfo.h 2024-09-09 16:00:30.668750292 +0200 | ||
@@ -22,6 +22,7 @@ | ||
#ifndef _HDFS_LIBHDFS3_SERVER_DATANODEINFO_H_ | ||
#define _HDFS_LIBHDFS3_SERVER_DATANODEINFO_H_ | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
#include <sstream> | ||
|
||
--- hawq-rel-v3.0.0.0/depends/libhdfs3/src/client/Permission.h.orig 2024-09-12 18:03:12.371739127 +0200 | ||
+++ hawq-rel-v3.0.0.0/depends/libhdfs3/src/client/Permission.h 2024-09-09 16:00:30.672750340 +0200 | ||
@@ -22,6 +22,7 @@ | ||
#ifndef _HDFS_LIBHDFS3_CLIENT_PERMISSION_H_ | ||
#define _HDFS_LIBHDFS3_CLIENT_PERMISSION_H_ | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
|
||
namespace Hdfs { | ||
--- hawq-rel-v3.0.0.0/depends/libhdfs3/src/common/FileWrapper.h.orig 2024-09-12 18:03:30.748947136 +0200 | ||
+++ hawq-rel-v3.0.0.0/depends/libhdfs3/src/common/FileWrapper.h 2024-09-09 16:00:30.664750244 +0200 | ||
@@ -22,6 +22,7 @@ | ||
#ifndef _HDFS_LIBHDFS3_COMMON_FILEWRAPPER_H_ | ||
#define _HDFS_LIBHDFS3_COMMON_FILEWRAPPER_H_ | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
#include <cassert> | ||
#include <cstdio> |