Date: Monday, March 15, 2021 @ 09:02:08
Author: kgizdov
Revision: 891414
upgpkg: xrootd 5.1.1-1
Modified:
xrootd/trunk/PKGBUILD
xrootd/trunk/cxx17.patch
-------------+
PKGBUILD | 8 ++++----
cxx17.patch | 38 +++++++++++++++++++++++++++++++++-----
2 files changed, 37 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-03-15 08:44:34 UTC (rev 891413)
+++ PKGBUILD 2021-03-15 09:02:08 UTC (rev 891414)
@@ -3,8 +3,8 @@
# 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.0.2
-pkgrel=2
+pkgver=5.1.1
+pkgrel=1
arch=('x86_64')
url="https://xrootd.slac.stanford.edu/"
license=('LGPL3')
@@ -17,7 +17,7 @@
'add_missing_header.patch'
)
sha256sums=('SKIP'
- '828de400b8fef40a80b9eadb8198fdfe7c991515a466045b699425df2f681817'
+ '259b3c2a21d0ea712bb4f65247d32d096b6e69637b4e9b3eef03df5797659990'
'68eac594d8d3b15c1e4d8522c4422a26c9a51c9206d3a88fedf00d4e9599d455')
get_pyver () {
@@ -81,7 +81,7 @@
cd "${srcdir}/build"
make DESTDIR="${pkgdir}" install
# drop unneeded test bin & lib
- rm "${pkgdir}/usr/bin/text-runner"
+ rm "${pkgdir}/usr/bin/test-runner"
rm "${pkgdir}/usr/lib/libXrdClTests.so"
install -d "${pkgdir}/usr/lib/cmake/XRootD"
mv "${pkgdir}/usr/share/xrootd/cmake/XRootDConfig.cmake" "${pkgdir}/usr/lib/cmake/XRootD"/
Modified: cxx17.patch
===================================================================
--- cxx17.patch 2021-03-15 08:44:34 UTC (rev 891413)
+++ cxx17.patch 2021-03-15 09:02:08 UTC (rev 891414)
@@ -22,20 +22,22 @@
ccl=cfg_vars["CC"].split()
ccl[0]="${CMAKE_C_COMPILER}"
diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
-index cf733e4fe..c749813c6 100644
+index ee4525490..0257989f2 100644
--- a/cmake/XRootDOSDefs.cmake
+++ b/cmake/XRootDOSDefs.cmake
-@@ -19,15 +19,15 @@ endif()
+@@ -21,9 +21,9 @@ endif()
add_definitions( -DUSE_LIBC_SEMAPHORE=${USE_LIBC_SEMAPHORE} )
#-------------------------------------------------------------------------------
-# Enable c++0x / c++11
-+# Enable c++1y / c++17
++# 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()
# GCC
#-------------------------------------------------------------------------------
if( CMAKE_COMPILER_IS_GNUCXX )
@@ -45,7 +47,7 @@
#-----------------------------------------------------------------------------
# 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 817cacf13..45889d2f8 100644
+index 151f2b628..3f191db55 100644
--- a/src/XrdSsi/XrdSsiAtomics.hh
+++ b/src/XrdSsi/XrdSsiAtomics.hh
@@ -34,12 +34,12 @@
@@ -53,7 +55,7 @@
//-----------------------------------------------------------------------------
-//! Use native atomics at the c11 or higher level (-std=c++0x -lstdc++)
-+//! Use native atomics at the c11 or higher level (-std=c++17 -lstdc++)
++//! Use native atomics at the c17 or higher level (-std=c++17 -lstdc++)
//-----------------------------------------------------------------------------
#if __cplusplus >= 201103L
#include <atomic>
@@ -76,3 +78,29 @@
#-------------------------------------------------------------------------------
# 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 )