[arch-commits] Commit in xrootd/repos (4 files)
Konstantin Gizdov
kgizdov at gemini.archlinux.org
Mon Jun 13 13:30:07 UTC 2022
Date: Monday, June 13, 2022 @ 13:30:07
Author: kgizdov
Revision: 1237503
archrelease: copy trunk to community-testing-x86_64
Added:
xrootd/repos/community-testing-x86_64/
xrootd/repos/community-testing-x86_64/PKGBUILD
(from rev 1237502, xrootd/trunk/PKGBUILD)
xrootd/repos/community-testing-x86_64/add_missing_header.patch
(from rev 1237502, xrootd/trunk/add_missing_header.patch)
xrootd/repos/community-testing-x86_64/cxx17.patch
(from rev 1237502, xrootd/trunk/cxx17.patch)
--------------------------+
PKGBUILD | 91 +++++++++++++++++++++++++++++++++++++++++++++
add_missing_header.patch | 12 +++++
cxx17.patch | 80 +++++++++++++++++++++++++++++++++++++++
3 files changed, 183 insertions(+)
Copied: xrootd/repos/community-testing-x86_64/PKGBUILD (from rev 1237502, xrootd/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2022-06-13 13:30:07 UTC (rev 1237503)
@@ -0,0 +1,91 @@
+# Maintainer: Konstantin Gizdov < arch at kge dot pw >
+# Contributor: Jan Kašpar < jan.kaspar at gmail dot com >
+# 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.3
+pkgrel=1
+arch=('x86_64')
+url="https://xrootd.slac.stanford.edu/"
+license=('LGPL3')
+depends=('ceph' 'curl' 'json-c' 'libxml2' 'openssl' 'perl' 'python' 'systemd')
+makedepends=('cmake' 'git')
+checkdepends=('cppunit')
+source=(
+ "${pkgname}-${pkgver}::git+https://github.com/${pkgname}/${pkgname}.git#tag=v${pkgver}"
+ 'cxx17.patch'
+ 'add_missing_header.patch'
+)
+sha256sums=('SKIP'
+ 'a6c7a9fc57e0e357ec9b993acb192a24f4839fd26e8a11278703033433c208ea'
+ '2e1f604e8006c6d6634fb7e3cd9b17d321c2d0da5ce12b2db1b0dd97871dfefe')
+
+get_pyver () {
+ python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
+}
+
+prepare () {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ # source tarballs don't seem to contain all submodules anymore
+ git submodule update --init --recursive
+ patch -Np1 -i "${srcdir}/cxx17.patch"
+ patch -Np1 -i "${srcdir}/add_missing_header.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ # configure
+ mkdir -p "${srcdir}/build"
+ cd "${srcdir}/build"
+
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ cmake -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DCMAKE_INSTALL_LIBDIR:PATH=lib \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_CXX_STANDARD="17" \
+ -DWITH_OPENSSL3=TRUE \
+ -DENABLE_TESTS=1 \
+ -DXRD_PYTHON_REQ_VERSION=$(get_pyver) \
+ "${srcdir}/${pkgbase}-${pkgver}"
+
+ # build
+ make
+}
+
+check() {
+ cd "${srcdir}/build/tests"
+
+ # Check has significantly changed, to-be-updated
+ # ./common/text-runner ./XrdCephTests/libXrdCephTests.so "All Tests"
+
+ ##
+ # This requires a running XRootD server with multiIP DNS forwarder and local disk servers
+ # only run this if you have configured the env correctly,
+ # examples in https://github.com/xrootd/xrootd-test-suite
+ # sample environment can be configured like so:
+ # export XRDTEST_MAINSERVERURL=metaman.xrd.test
+ # or export XRDTEST_MAINSERVERURL=http://xrootd.cern.ch/
+ # export XRDTEST_DISKSERVERURL=srv1.xrd.test
+ # or export XRDTEST_DISKSERVERURL=http://xrootd.cern.ch/
+ # export XRDTEST_DATAPATH=/tests/test-files/
+ # export XRDTEST_LOCALFILE=/data/a048e67f-4397-4bb8-85eb-8d7e40d90763.dat
+ # or export XRDTEST_LOCALFILE=/tmp/accwe.root
+ # export XRDTEST_REMOTEFILE=${XRDTEST_MAINSERVERURL}${XRDTEST_DATAPATH}/a048e67f-4397-4bb8-85eb-8d7e40d90763.dat
+ # or export XRDTEST_MULTIIPSERVERURL=multiip.xrd.test
+ # ./common/text-runner ./XrdClTests/libXrdClTests.so "All Tests"
+}
+
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ # drop unneeded test bin & lib
+ 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"/
+ rm -rf "${pkgdir}/usr/share/xrootd/cmake"
+ ln -s "/usr/lib/cmake" "${pkgdir}/usr/share/xrootd/cmake"
+}
Copied: xrootd/repos/community-testing-x86_64/add_missing_header.patch (from rev 1237502, xrootd/trunk/add_missing_header.patch)
===================================================================
--- community-testing-x86_64/add_missing_header.patch (rev 0)
+++ community-testing-x86_64/add_missing_header.patch 2022-06-13 13:30:07 UTC (rev 1237503)
@@ -0,0 +1,12 @@
+diff --git a/src/Xrd/XrdConfig.cc b/src/Xrd/XrdConfig.cc
+index 1be14323e..4b6d9caec 100644
+--- a/src/Xrd/XrdConfig.cc
++++ b/src/Xrd/XrdConfig.cc
+@@ -46,6 +46,7 @@
+ #include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/socket.h>
+ #include <sys/un.h>
+
+ #include "XrdVersion.hh"
Copied: xrootd/repos/community-testing-x86_64/cxx17.patch (from rev 1237502, xrootd/trunk/cxx17.patch)
===================================================================
--- community-testing-x86_64/cxx17.patch (rev 0)
+++ community-testing-x86_64/cxx17.patch 2022-06-13 13:30:07 UTC (rev 1237503)
@@ -0,0 +1,80 @@
+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++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++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++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 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
+ #-------------------------------------------------------------------------------
+ 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
+@@ -22,7 +22,7 @@
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing" )
+ endif()
+
+- # 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>
+ #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