[arch-commits] Commit in xrootd/trunk (PKGBUILD add_missing_header.patch cxx17.patch)
Konstantin Gizdov
kgizdov at archlinux.org
Wed Jun 9 13:15:13 UTC 2021
Date: Wednesday, June 9, 2021 @ 13:15:12
Author: kgizdov
Revision: 960092
upgpkg: xrootd 5.2.0-1
Modified:
xrootd/trunk/PKGBUILD
xrootd/trunk/add_missing_header.patch
xrootd/trunk/cxx17.patch
--------------------------+
PKGBUILD | 6 +-
add_missing_header.patch | 15 ------
cxx17.patch | 112 +++++++++++++++------------------------------
3 files changed, 41 insertions(+), 92 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-09 12:48:03 UTC (rev 960091)
+++ PKGBUILD 2021-06-09 13:15:12 UTC (rev 960092)
@@ -3,7 +3,7 @@
# Contributor: Alex Pearce < alex at alexpearce dot me >
pkgname=xrootd
pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
-pkgver=5.1.1
+pkgver=5.2.0
pkgrel=1
arch=('x86_64')
url="https://xrootd.slac.stanford.edu/"
@@ -17,8 +17,8 @@
'add_missing_header.patch'
)
sha256sums=('SKIP'
- '259b3c2a21d0ea712bb4f65247d32d096b6e69637b4e9b3eef03df5797659990'
- '68eac594d8d3b15c1e4d8522c4422a26c9a51c9206d3a88fedf00d4e9599d455')
+ 'e858bd8aed663f045a14158403f5cad397e69400852270accbd3a7e7fa4bf75a'
+ '2e1f604e8006c6d6634fb7e3cd9b17d321c2d0da5ce12b2db1b0dd97871dfefe')
get_pyver () {
python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
Modified: add_missing_header.patch
===================================================================
--- add_missing_header.patch 2021-06-09 12:48:03 UTC (rev 960091)
+++ add_missing_header.patch 2021-06-09 13:15:12 UTC (rev 960092)
@@ -10,18 +10,3 @@
#include <sys/un.h>
#include "XrdVersion.hh"
-@@ -793,12 +794,12 @@ int XrdConfig::ConfigXeq(char *var, XrdOucStream &Config, XrdSysError *eDest)
-
- int XrdConfig::ASocket(const char *path, const char *fname, mode_t mode)
- {
-- struct sockaddr_un unix;
-+ struct sockaddr_un my_local_unix;
- int plen = strlen(path), flen = strlen(fname);
-
- // Make sure we can fit everything in our buffer
- //
-- if ((plen + flen + 3) > (int)sizeof(unix.sun_path))
-+ if ((plen + flen + 3) > (int)sizeof(my_local_unix.sun_path))
- {Log.Emsg("Config", "admin path", path, "too long");
- return 1;
- }
Modified: cxx17.patch
===================================================================
--- cxx17.patch 2021-06-09 12:48:03 UTC (rev 960091)
+++ cxx17.patch 2021-06-09 13:15:12 UTC (rev 960092)
@@ -1,8 +1,7 @@
-diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
-index cea13f3a9..dcfc46b05 100644
---- a/bindings/python/setup.py.in
-+++ b/bindings/python/setup.py.in
-@@ -8,15 +8,15 @@ import subprocess
+diff --color -aur --color xrootd-5.2.0-old/bindings/python/setup.py.in xrootd-5.2.0-new/bindings/python/setup.py.in
+--- xrootd-5.2.0-old/bindings/python/setup.py.in 2021-06-09 15:59:33.172986312 +0300
++++ xrootd-5.2.0-new/bindings/python/setup.py.in 2021-06-09 16:04:23.386332431 +0300
+@@ -8,15 +8,15 @@
# Remove the "-Wstrict-prototypes" compiler option, which isn't valid for C++.
cfg_vars = sysconfig.get_config_vars()
opt = cfg_vars["OPT"]
@@ -21,54 +20,33 @@
ccl=cfg_vars["CC"].split()
ccl[0]="${CMAKE_C_COMPILER}"
-diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
-index ee4525490..0257989f2 100644
---- a/cmake/XRootDOSDefs.cmake
-+++ b/cmake/XRootDOSDefs.cmake
-@@ -21,9 +21,9 @@ endif()
- add_definitions( -DUSE_LIBC_SEMAPHORE=${USE_LIBC_SEMAPHORE} )
-
- #-------------------------------------------------------------------------------
--# Enable c++0x / c++11
-+# Enable c++17
- #-------------------------------------------------------------------------------
--set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -DOPENSSL_NO_FILENAMES" )
-+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DOPENSSL_NO_FILENAMES" )
-
- #-------------------------------------------------------------------------------
- # Enable XrdCl::Pipelines for clang compiler
-@@ -37,7 +37,7 @@ endif()
+diff --color -aur --color xrootd-5.2.0-old/src/XrdCeph/cmake/XRootDOSDefs.cmake xrootd-5.2.0-new/src/XrdCeph/cmake/XRootDOSDefs.cmake
+--- xrootd-5.2.0-old/src/XrdCeph/cmake/XRootDOSDefs.cmake 2021-06-09 15:59:33.186319646 +0300
++++ xrootd-5.2.0-new/src/XrdCeph/cmake/XRootDOSDefs.cmake 2021-06-09 16:00:58.342990071 +0300
+@@ -11,7 +11,7 @@
# GCC
#-------------------------------------------------------------------------------
if( CMAKE_COMPILER_IS_GNUCXX )
-- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
+- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17" )
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
- #-----------------------------------------------------------------------------
- # Set -Werror only for Debug (or undefined) build type or if we have been
-diff --git a/src/XrdSsi/XrdSsiAtomics.hh b/src/XrdSsi/XrdSsiAtomics.hh
-index 151f2b628..3f191db55 100644
---- a/src/XrdSsi/XrdSsiAtomics.hh
-+++ b/src/XrdSsi/XrdSsiAtomics.hh
-@@ -34,12 +34,12 @@
- #undef NEED_ATOMIC_MUTEX
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
+ # gcc 4.1 is retarded
+diff --color -aur --color xrootd-5.2.0-old/src/XrdClHttp/CMakeLists.txt xrootd-5.2.0-new/src/XrdClHttp/CMakeLists.txt
+--- xrootd-5.2.0-old/src/XrdClHttp/CMakeLists.txt 2021-06-09 15:59:33.192986313 +0300
++++ xrootd-5.2.0-new/src/XrdClHttp/CMakeLists.txt 2021-06-09 16:03:54.576331167 +0300
+@@ -6,7 +6,7 @@
+ ${PROJECT_SOURCE_DIR}/src
+ ${PROJECT_SOURCE_DIR}/cmake)
- //-----------------------------------------------------------------------------
--//! Use native atomics at the c11 or higher level (-std=c++0x -lstdc++)
-+//! Use native atomics at the c17 or higher level (-std=c++17 -lstdc++)
- //-----------------------------------------------------------------------------
- #if __cplusplus >= 201103L
- #include <atomic>
- #define Atomic(type) std::atomic<type>
--#define Atomic_IMP "C++11"
-+#define Atomic_IMP "C++17"
- #define Atomic_BEG(x)
- #define Atomic_DEC(x) x.fetch_sub(1,std::memory_order_relaxed)
- #define Atomic_GET(x) x.load(std::memory_order_relaxed)
-diff --git a/tests/XrdClTests/tls/CMakeLists.txt b/tests/XrdClTests/tls/CMakeLists.txt
-index bf6ee2317..f9ce03ca0 100644
---- a/tests/XrdClTests/tls/CMakeLists.txt
-+++ b/tests/XrdClTests/tls/CMakeLists.txt
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+
+ # Defaults
+ if( NOT XRDCLHTTP_SUBMODULE )
+diff --color -aur --color xrootd-5.2.0-old/tests/XrdClTests/tls/CMakeLists.txt xrootd-5.2.0-new/tests/XrdClTests/tls/CMakeLists.txt
+--- xrootd-5.2.0-old/tests/XrdClTests/tls/CMakeLists.txt 2021-06-09 15:59:33.219652981 +0300
++++ xrootd-5.2.0-new/tests/XrdClTests/tls/CMakeLists.txt 2021-06-09 16:04:42.392999919 +0300
@@ -1,7 +1,7 @@
include( XRootDCommon )
@@ -78,29 +56,15 @@
#-------------------------------------------------------------------------------
# xrdcopy
-diff --git a/src/XrdCeph/cmake/XRootDOSDefs.cmake b/src/XrdCeph/cmake/XRootDOSDefs.cmake
-index eadc2495..2969c543 100644
---- a/src/XrdCeph/cmake/XRootDOSDefs.cmake
-+++ b/src/XrdCeph/cmake/XRootDOSDefs.cmake
-@@ -11,7 +11,7 @@ set( LIBRARY_PATH_PREFIX "lib" )
- # GCC
- #-------------------------------------------------------------------------------
- if( CMAKE_COMPILER_IS_GNUCXX )
-- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
-+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17" )
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" )
- # gcc 4.1 is retarded
-diff --git a/src/XrdClHttp/CMakeLists.txt b/src/XrdClHttp/CMakeLists.txt
-index 3b38522..968811a 100644
---- a/src/XrdClHttp/CMakeLists.txt
-+++ b/src/XrdClHttp/CMakeLists.txt
-@@ -6,7 +6,7 @@ list(APPEND CMAKE_MODULE_PATH
- ${PROJECT_SOURCE_DIR}/src
- ${PROJECT_SOURCE_DIR}/cmake)
-
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-
- # Defaults
- if( NOT XRDCLHTTP_SUBMODULE )
+diff --color -aur --color xrootd-5.2.0-old/src/XrdSsi/XrdSsiAtomics.hh xrootd-5.2.0-new/src/XrdSsi/XrdSsiAtomics.hh
+--- xrootd-5.2.0-old/src/XrdSsi/XrdSsiAtomics.hh 2021-06-09 16:10:26.399681671 +0300
++++ xrootd-5.2.0-new/src/XrdSsi/XrdSsiAtomics.hh 2021-06-09 16:11:21.983017456 +0300
+@@ -39,7 +39,7 @@
+ #if __cplusplus >= 201103L
+ #include <atomic>
+ #define Atomic(type) std::atomic<type>
+-#define Atomic_IMP "C++11"
++#define Atomic_IMP "C++17"
+ #define Atomic_BEG(x)
+ #define Atomic_DEC(x) x.fetch_sub(1,std::memory_order_relaxed)
+ #define Atomic_GET(x) x.load(std::memory_order_relaxed)
More information about the arch-commits
mailing list