[arch-commits] Commit in xrootd/trunk (PKGBUILD cxx17.patch)
Konstantin Gizdov
kgizdov at gemini.archlinux.org
Mon Jun 13 13:30:00 UTC 2022
Date: Monday, June 13, 2022 @ 13:30:00
Author: kgizdov
Revision: 1237502
upgpkg: xrootd 5.4.3-1
Modified:
xrootd/trunk/PKGBUILD
xrootd/trunk/cxx17.patch
-------------+
PKGBUILD | 4 +-
cxx17.patch | 82 ++++++++++++++++++++++++++++++++--------------------------
2 files changed, 48 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-13 13:29:40 UTC (rev 1237501)
+++ PKGBUILD 2022-06-13 13:30:00 UTC (rev 1237502)
@@ -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.4.2
+pkgver=5.4.3
pkgrel=1
arch=('x86_64')
url="https://xrootd.slac.stanford.edu/"
@@ -17,7 +17,7 @@
'add_missing_header.patch'
)
sha256sums=('SKIP'
- 'e858bd8aed663f045a14158403f5cad397e69400852270accbd3a7e7fa4bf75a'
+ 'a6c7a9fc57e0e357ec9b993acb192a24f4839fd26e8a11278703033433c208ea'
'2e1f604e8006c6d6634fb7e3cd9b17d321c2d0da5ce12b2db1b0dd97871dfefe')
get_pyver () {
Modified: cxx17.patch
===================================================================
--- cxx17.patch 2022-06-13 13:29:40 UTC (rev 1237501)
+++ cxx17.patch 2022-06-13 13:30:00 UTC (rev 1237502)
@@ -1,28 +1,53 @@
-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 @@
+diff --color -aur xrootd-5.4.3-old/bindings/python/setup.py.in xrootd-5.4.3-new/bindings/python/setup.py.in
+--- xrootd-5.4.3-old/bindings/python/setup.py.in 2022-06-13 16:17:49.244651243 +0300
++++ xrootd-5.4.3-new/bindings/python/setup.py.in 2022-06-13 16:19:50.844651430 +0300
+@@ -24,15 +24,15 @@
# Remove the "-Wstrict-prototypes" compiler option, which isn't valid for C++.
cfg_vars = sysconfig.get_config_vars()
opt = cfg_vars["OPT"]
--cfg_vars["OPT"] = " ".join( flag for flag in opt.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++0x"
+-cfg_vars["OPT"] = " ".join( flag for flag in opt.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++14"
+cfg_vars["OPT"] = " ".join( flag for flag in opt.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++17"
cflags = cfg_vars["CFLAGS"]
--cfg_vars["CFLAGS"] = " ".join( flag for flag in cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++0x"
+-cfg_vars["CFLAGS"] = " ".join( flag for flag in cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++14"
+cfg_vars["CFLAGS"] = " ".join( flag for flag in cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++17"
# pypy doesn't define PY_CFLAGS so skip it if it's missing
if "PY_CFLAGS" in cfg_vars:
py_cflags = cfg_vars["PY_CFLAGS"]
-- cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++0x"
+- cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++14"
+ cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] ) + " --std=c++17"
ccl=cfg_vars["CC"].split()
ccl[0]="${CMAKE_C_COMPILER}"
-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
+diff --color -aur xrootd-5.4.3-old/cmake/XRootDOSDefs.cmake xrootd-5.4.3-new/cmake/XRootDOSDefs.cmake
+--- xrootd-5.4.3-old/cmake/XRootDOSDefs.cmake 2022-06-13 16:17:49.247984576 +0300
++++ xrootd-5.4.3-new/cmake/XRootDOSDefs.cmake 2022-06-13 16:19:20.974651382 +0300
+@@ -18,7 +18,7 @@
+ #-------------------------------------------------------------------------------
+ # Enable c++14
+ #-------------------------------------------------------------------------------
+-set(CMAKE_CXX_STANDARD 14)
++set(CMAKE_CXX_STANDARD 17)
+
+ if( ENABLE_ASAN )
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+diff --color -aur xrootd-5.4.3-old/cmake/XRootDSystemCheck.cmake xrootd-5.4.3-new/cmake/XRootDSystemCheck.cmake
+--- xrootd-5.4.3-old/cmake/XRootDSystemCheck.cmake 2022-06-13 16:17:49.247984576 +0300
++++ xrootd-5.4.3-new/cmake/XRootDSystemCheck.cmake 2022-06-13 16:22:48.487985058 +0300
+@@ -144,7 +144,7 @@
+ #-------------------------------------------------------------------------------
+ function(check_working_cxx_atomics varname)
+ set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11")
++ set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++17")
+ check_cxx_source_compiles("
+ #include <atomic>
+ #include <cstdint>
+Only in xrootd-5.4.3-old: omg
+diff --color -aur xrootd-5.4.3-old/src/XrdCeph/cmake/XRootDOSDefs.cmake xrootd-5.4.3-new/src/XrdCeph/cmake/XRootDOSDefs.cmake
+--- xrootd-5.4.3-old/src/XrdCeph/cmake/XRootDOSDefs.cmake 2022-06-13 16:17:49.251317910 +0300
++++ xrootd-5.4.3-new/src/XrdCeph/cmake/XRootDOSDefs.cmake 2022-06-13 16:21:05.804651570 +0300
@@ -11,7 +11,7 @@
# GCC
#-------------------------------------------------------------------------------
@@ -32,33 +57,18 @@
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)
+@@ -22,7 +22,7 @@
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing" )
+ endif()
--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 )
-
--set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )
-+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17" )
-
- #-------------------------------------------------------------------------------
- # xrdcopy
-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
+- # for 4.9.3 or greater the 'omit-frame-pointer'
++ # for 4.9.3 or greater the 'omit-frame-pointer'
+ # interfears with custom semaphore implementation
+ if( (GCC_VERSION VERSION_GREATER 4.9.2) AND (USE_LIBC_SEMAPHORE EQUAL 0) )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer" )
+diff --color -aur xrootd-5.4.3-old/src/XrdSsi/XrdSsiAtomics.hh xrootd-5.4.3-new/src/XrdSsi/XrdSsiAtomics.hh
+--- xrootd-5.4.3-old/src/XrdSsi/XrdSsiAtomics.hh 2022-06-13 16:17:49.264651243 +0300
++++ xrootd-5.4.3-new/src/XrdSsi/XrdSsiAtomics.hh 2022-06-13 16:25:39.107985328 +0300
@@ -39,7 +39,7 @@
#if __cplusplus >= 201103L
#include <atomic>
More information about the arch-commits
mailing list