summaryrefslogtreecommitdiff
path: root/net-libs/xrootd/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-07-06 08:06:16 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-07-06 08:06:16 +0100
commit4187bba080530c5ca1c7dae9c233e88f3fc8f535 (patch)
treeb6f535e053876097ced1b6bda14a4da890c730d4 /net-libs/xrootd/files
parent2a8d2f71d1d9963368e0ef3d641d75979a689d12 (diff)
gentoo auto-resync : 06:07:2024 - 08:06:15
Diffstat (limited to 'net-libs/xrootd/files')
-rw-r--r--net-libs/xrootd/files/xrootd-4.8.3-crc32.patch58
-rw-r--r--net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch15
2 files changed, 0 insertions, 73 deletions
diff --git a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
deleted file mode 100644
index 9f27c4369880..000000000000
--- a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 64f81b7fad227097f5e135d25a5574cfecf4d50d Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Fri, 18 May 2018 11:30:58 +0200
-Subject: [PATCH] Remove declarations of crc32 and adler32
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These break compilation with the error below:
-
-xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:
- In function ‘int DoA32(const char*)’:
-xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:418:34:
- error: expected initializer before ‘OF’
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
- ^^
----
- src/XrdSsi/XrdSsiShMam.cc | 2 +-
- tests/XrdSsiTests/XrdShMap.cc | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/XrdSsi/XrdSsiShMam.cc b/src/XrdSsi/XrdSsiShMam.cc
-index 013dc855..a4803d71 100644
---- a/src/XrdSsi/XrdSsiShMam.cc
-+++ b/src/XrdSsi/XrdSsiShMam.cc
-@@ -882,7 +882,7 @@ bool XrdSsiShMam::GetItem(void *data, const char *key, int hash)
- /******************************************************************************/
-
- int XrdSsiShMam::HashVal(const char *key)
--{ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
-+{
- uLong crc;
- int hval, klen = strlen(key);
-
-diff --git a/tests/XrdSsiTests/XrdShMap.cc b/tests/XrdSsiTests/XrdShMap.cc
-index bb642ac3..860fa7ad 100644
---- a/tests/XrdSsiTests/XrdShMap.cc
-+++ b/tests/XrdSsiTests/XrdShMap.cc
-@@ -415,7 +415,6 @@ void Explain(const char *what)
-
- int DoA32(const char *buff)
- {
-- ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
- uLong adler = adler32(0L, Z_NULL, 0);
-
- // Check for ID request now
-@@ -438,8 +437,6 @@ int DoA32(const char *buff)
-
- int DoC32(const char *buff)
- {
-- ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
--
- // Check for ID request now
- //
- if (!buff) {int myID; memcpy(&myID, "c32 ", sizeof(int)); return myID;}
---
-2.17.0
-
diff --git a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
deleted file mode 100644
index 04607cdd7b04..000000000000
--- a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/bindings/python/CMakeLists.txt
-+++ b/bindings/python/CMakeLists.txt
-@@ -32,6 +32,7 @@
-
- configure_file(${SETUP_PY_IN} ${SETUP_PY})
-
-+if (0)
- string(FIND "${PIP_OPTIONS}" "--prefix" PIP_OPTIONS_PREFIX_POSITION)
- if( "${PIP_OPTIONS_PREFIX_POSITION}" EQUAL "-1" )
- string(APPEND PIP_OPTIONS " --prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}")
-@@ -100,3 +101,4 @@
- )"
- )
- endif()
-+endif()