diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-05-16 22:07:44 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-16 22:07:44 +0100 |
commit | c4507bfdfd706b2b1301972490fe88ac3ddbc70e (patch) | |
tree | 72500f6288cf79e445e6a5cb03337f4f64ce49db /net-fs/cvmfs/files | |
parent | aa0b5f37afc4a88422d6301d07e4e3852ddd7251 (diff) |
gentoo auto-resync : 16:05:2023 - 22:07:44
Diffstat (limited to 'net-fs/cvmfs/files')
-rw-r--r-- | net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch | 95 | ||||
-rw-r--r-- | net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch | 41 | ||||
-rw-r--r-- | net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch | 10 |
3 files changed, 0 insertions, 146 deletions
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch deleted file mode 100644 index cbc723a7fd70..000000000000 --- a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 966d98be2d2d6169a29c22eb5565f34fad1c0fb9 Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio <guilherme@amadio.org> -Date: Mon, 6 Apr 2020 17:19:19 +0200 -Subject: [PATCH 2/3] Build some externals as part of the regular build - ---- - CMakeLists.txt | 9 ++++++--- - externals/sha2/src/CMakeLists.txt | 8 ++++++++ - externals/sha3/src/CMakeLists.txt | 14 ++++++++++++++ - externals/vjson/src/CMakeLists.txt | 8 ++++++++ - 4 files changed, 36 insertions(+), 3 deletions(-) - create mode 100644 externals/sha2/src/CMakeLists.txt - create mode 100644 externals/sha3/src/CMakeLists.txt - create mode 100644 externals/vjson/src/CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a50b603fe..3403ae67b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -320,7 +320,8 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS}) - find_package (GMock REQUIRED) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS}) - --find_package (VJSON REQUIRED) -+#find_package (VJSON REQUIRED) -+add_subdirectory(externals/vjson/src) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS}) - - find_package (LibArchive REQUIRED) -@@ -333,10 +334,12 @@ if (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR - find_package (ZLIB REQUIRED) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS}) - -- find_package (SHA2 REQUIRED) -+ #find_package (SHA2 REQUIRED) -+ add_subdirectory(externals/sha2/src) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA2_INCLUDE_DIRS}) - -- find_package (SHA3 REQUIRED) -+ # find_package (SHA3 REQUIRED) -+ add_subdirectory(externals/sha3/src) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS}) - endif (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR - BUILD_UNITTESTS OR BUILD_UNITTESTS_DEBUG OR BUILD_PRELOADER OR -diff --git a/externals/sha2/src/CMakeLists.txt b/externals/sha2/src/CMakeLists.txt -new file mode 100644 -index 000000000..091e1ed6b ---- /dev/null -+++ b/externals/sha2/src/CMakeLists.txt -@@ -0,0 +1,8 @@ -+project(SHA2) -+ -+add_library(cvmfs_sha2 STATIC sha2.c) -+set_property(TARGET cvmfs_sha2 PROPERTY POSITION_INDEPENDENT_CODE TRUE) -+target_include_directories(cvmfs_sha2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -+ -+set(SHA2_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE) -+set(SHA2_LIBRARIES cvmfs_sha2 PARENT_SCOPE) -diff --git a/externals/sha3/src/CMakeLists.txt b/externals/sha3/src/CMakeLists.txt -new file mode 100644 -index 000000000..15db012d4 ---- /dev/null -+++ b/externals/sha3/src/CMakeLists.txt -@@ -0,0 +1,14 @@ -+project(SHA3) -+ -+add_library(cvmfs_sha3 STATIC #GLOBAL -+ 64opt/KeccakF-1600-opt64.c -+ KeccakHash.c -+ KeccakSponge.c -+ SnP-FBWL-default.c -+ ) -+ -+set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE) -+target_include_directories(cvmfs_sha3 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt) -+ -+set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt PARENT_SCOPE) -+set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE) -diff --git a/externals/vjson/src/CMakeLists.txt b/externals/vjson/src/CMakeLists.txt -new file mode 100644 -index 000000000..316ab7617 ---- /dev/null -+++ b/externals/vjson/src/CMakeLists.txt -@@ -0,0 +1,8 @@ -+project(VJSON) -+ -+add_library(cvmfs_vjson STATIC block_allocator.cpp json.cpp) -+set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE) -+target_include_directories(cvmfs_vjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) -+ -+set(VJSON_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE) -+set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE) --- -2.26.0 - diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch deleted file mode 100644 index ce4b85f7921f..000000000000 --- a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3a4881d1dc211ec358995d6d8501818beedc62ac Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio <guilherme@amadio.org> -Date: Mon, 6 Apr 2020 17:26:48 +0200 -Subject: [PATCH 3/3] Comment out unnecessary package lookups - ---- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3403ae67b..2895b567a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -295,7 +295,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CMAKE_BINARY_DIR}) - # set properties for configurable libraries - # - --find_package (Valgrind) -+# find_package (Valgrind) - if (VALGRIND_FOUND) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VALGRIND_INCLUDE_DIR}) - add_definitions(-DHAS_VALGRIND_HEADERS) -@@ -314,11 +314,11 @@ endif (NOT MACOSX) - find_package (OpenSSL REQUIRED) - set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR}) - --find_package (GTest REQUIRED) --set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS}) -+# find_package (GTest REQUIRED) -+# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS}) - --find_package (GMock REQUIRED) --set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS}) -+# find_package (GMock REQUIRED) -+# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS}) - - #find_package (VJSON REQUIRED) - add_subdirectory(externals/vjson/src) --- -2.26.0 - diff --git a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch deleted file mode 100644 index 0dd97cc1f709..000000000000 --- a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/cvmfs/authz/helper_log.cc 2022-07-04 12:15:08.000000000 +0200 -+++ b/cvmfs/authz/helper_log.cc 2022-09-01 17:55:08.200175687 +0200 -@@ -8,6 +8,7 @@ - #include <fcntl.h> - #include <syslog.h> - #include <unistd.h> -+#include <ctime> - - #include <cassert> - #include <cstdarg> |