[arch-commits] Commit in xrootd4/repos/community-x86_64 (5 files)
Konstantin Gizdov
kgizdov at gemini.archlinux.org
Wed Sep 29 08:00:10 UTC 2021
Date: Wednesday, September 29, 2021 @ 08:00:10
Author: kgizdov
Revision: 1025927
archrelease: copy trunk to community-x86_64
Added:
xrootd4/repos/community-x86_64/PKGBUILD
(from rev 1025926, xrootd4/trunk/PKGBUILD)
xrootd4/repos/community-x86_64/cxx17.patch
(from rev 1025926, xrootd4/trunk/cxx17.patch)
xrootd4/repos/community-x86_64/stat_ver.patch
(from rev 1025926, xrootd4/trunk/stat_ver.patch)
Deleted:
xrootd4/repos/community-x86_64/PKGBUILD
xrootd4/repos/community-x86_64/cxx17.patch
----------------+
PKGBUILD | 175 +++++++++++++++++++++++++++----------------------------
cxx17.patch | 112 +++++++++++++++++------------------
stat_ver.patch | 125 +++++++++++++++++++++++++++++++++++++++
3 files changed, 270 insertions(+), 142 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-09-29 08:00:02 UTC (rev 1025926)
+++ PKGBUILD 2021-09-29 08:00:10 UTC (rev 1025927)
@@ -1,86 +0,0 @@
-# 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
-pkgname="${_pkgname}4"
-pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
-pkgver=4.12.6
-pkgrel=1
-arch=('x86_64')
-url="https://xrootd.slac.stanford.edu/"
-license=('LGPL3')
-depends=('ceph' 'curl' 'libxml2' 'openssl' 'perl' 'python')
-makedepends=('cmake' 'systemd')
-checkdepends=('cppunit')
-provides=('xrootd')
-conflicts=('xrootd')
-source=("${url}/download/v${pkgver}/${_pkgname}-${pkgver}.tar.gz"
- 'cxx17.patch')
-sha256sums=('1a9056ab7aeeaafa586ea77e442960c71d233c9ba60c7f9db9262c1410954ac4'
- 'ad423ea5c78c89e4f048da5c0ffd0fe263a3005e6de638077fbd770de89603eb')
-
-get_pyver () {
- python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
-}
-
-prepare () {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/cxx17.patch"
-}
-
-build() {
- cd "${srcdir}/${_pkgname}-${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" \
- -DENABLE_TESTS=1 \
- -DXRD_PYTHON_REQ_VERSION=$(get_pyver) \
- "${srcdir}/${_pkgname}-${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/text-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: xrootd4/repos/community-x86_64/PKGBUILD (from rev 1025926, xrootd4/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-09-29 08:00:10 UTC (rev 1025927)
@@ -0,0 +1,89 @@
+# 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
+pkgname="${_pkgname}4"
+pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
+pkgver=4.12.6
+pkgrel=2
+arch=('x86_64')
+url="https://xrootd.slac.stanford.edu/"
+license=('LGPL3')
+depends=('ceph' 'curl' 'libxml2' 'openssl' 'perl' 'python')
+makedepends=('cmake' 'systemd')
+checkdepends=('cppunit')
+provides=('xrootd')
+conflicts=('xrootd')
+source=("${url}/download/v${pkgver}/${_pkgname}-${pkgver}.tar.gz"
+ 'stat_ver.patch'
+ 'cxx17.patch')
+sha256sums=('1a9056ab7aeeaafa586ea77e442960c71d233c9ba60c7f9db9262c1410954ac4'
+ '9e8e17ea1a6a07a4d636d07c397fcfde5a6a398fea2fbb89a763044a481698af'
+ 'ad423ea5c78c89e4f048da5c0ffd0fe263a3005e6de638077fbd770de89603eb')
+
+get_pyver () {
+ python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
+}
+
+prepare () {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/cxx17.patch"
+ patch -Np1 -i "${srcdir}/stat_ver.patch"
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${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" \
+ -DENABLE_TESTS=1 \
+ -DXRD_PYTHON_REQ_VERSION=$(get_pyver) \
+ "${srcdir}/${_pkgname}-${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/text-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"
+}
Deleted: cxx17.patch
===================================================================
--- cxx17.patch 2021-09-29 08:00:02 UTC (rev 1025926)
+++ cxx17.patch 2021-09-29 08:00:10 UTC (rev 1025927)
@@ -1,56 +0,0 @@
-diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
-index 74fbe36a6..6bedbead8 100644
---- a/bindings/python/setup.py.in
-+++ b/bindings/python/setup.py.in
-@@ -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"]
--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++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++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++17"
-
- ccl=cfg_vars["CC"].split()
- ccl[0]="${CMAKE_C_COMPILER}"
-diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
-index 4933fd13f..20d8c524b 100644
---- a/cmake/XRootDOSDefs.cmake
-+++ b/cmake/XRootDOSDefs.cmake
-@@ -21,13 +21,13 @@ add_definitions( -DUSE_LIBC_SEMAPHORE=${USE_LIBC_SEMAPHORE} )
- #-------------------------------------------------------------------------------
- # Enable c++0x / c++11
- #-------------------------------------------------------------------------------
--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" )
-
- #-------------------------------------------------------------------------------
- # 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++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 ffe0a938e..ce23083e7 100644
---- a/src/XrdSsi/XrdSsiAtomics.hh
-+++ b/src/XrdSsi/XrdSsiAtomics.hh
-@@ -34,7 +34,7 @@
- #undef NEED_ATOMIC_MUTEX
-
- //-----------------------------------------------------------------------------
--//! 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++)
- //-----------------------------------------------------------------------------
- #if __cplusplus >= 201103L
- #include <atomic>
Copied: xrootd4/repos/community-x86_64/cxx17.patch (from rev 1025926, xrootd4/trunk/cxx17.patch)
===================================================================
--- cxx17.patch (rev 0)
+++ cxx17.patch 2021-09-29 08:00:10 UTC (rev 1025927)
@@ -0,0 +1,56 @@
+diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in
+index 74fbe36a6..6bedbead8 100644
+--- a/bindings/python/setup.py.in
++++ b/bindings/python/setup.py.in
+@@ -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"]
+-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++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++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++17"
+
+ ccl=cfg_vars["CC"].split()
+ ccl[0]="${CMAKE_C_COMPILER}"
+diff --git a/cmake/XRootDOSDefs.cmake b/cmake/XRootDOSDefs.cmake
+index 4933fd13f..20d8c524b 100644
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -21,13 +21,13 @@ add_definitions( -DUSE_LIBC_SEMAPHORE=${USE_LIBC_SEMAPHORE} )
+ #-------------------------------------------------------------------------------
+ # Enable c++0x / c++11
+ #-------------------------------------------------------------------------------
+-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" )
+
+ #-------------------------------------------------------------------------------
+ # 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++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 ffe0a938e..ce23083e7 100644
+--- a/src/XrdSsi/XrdSsiAtomics.hh
++++ b/src/XrdSsi/XrdSsiAtomics.hh
+@@ -34,7 +34,7 @@
+ #undef NEED_ATOMIC_MUTEX
+
+ //-----------------------------------------------------------------------------
+-//! 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++)
+ //-----------------------------------------------------------------------------
+ #if __cplusplus >= 201103L
+ #include <atomic>
Copied: xrootd4/repos/community-x86_64/stat_ver.patch (from rev 1025926, xrootd4/trunk/stat_ver.patch)
===================================================================
--- stat_ver.patch (rev 0)
+++ stat_ver.patch 2021-09-29 08:00:10 UTC (rev 1025927)
@@ -0,0 +1,125 @@
+From 5298c732c394d7ac3c24abc7d01a4631f573e692 Mon Sep 17 00:00:00 2001
+From: Michal Simon <michal.simon at cern.ch>
+Date: Mon, 2 Nov 2020 09:47:25 +0100
+Subject: [PATCH] [XrdPosix] Fix _STAT_VER problem on Fedora rawhide.
+
+---
+ src/XrdPosix/XrdPosix.cc | 10 +++++++---
+ src/XrdPosix/XrdPosixLinkage.hh | 10 +++++-----
+ src/XrdPosix/XrdPosixPreload32.cc | 4 ++--
+ 3 files changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
+index 290f9fe7314..f582eb4617c 100644
+--- a/src/XrdPosix/XrdPosix.cc
++++ b/src/XrdPosix/XrdPosix.cc
+@@ -375,7 +375,7 @@ int XrdPosix_Fstat(int fildes, struct stat *buf)
+ //
+ return (Xroot.myFD(fildes)
+ ? Xroot.Fstat(fildes, buf)
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ : Xunix.Fstat64(_STAT_VER, fildes, (struct stat64 *)buf));
+ #else
+ : Xunix.Fstat64( fildes, (struct stat64 *)buf));
+@@ -387,7 +387,11 @@ int XrdPosix_FstatV(int ver, int fildes, struct stat *buf)
+ {
+ return (Xroot.myFD(fildes)
+ ? Xroot.Fstat(fildes, buf)
++#ifdef _STAT_VER
+ : Xunix.Fstat64(ver, fildes, (struct stat64 *)buf));
++#else
++ : Xunix.Fstat64( fildes, (struct stat64 *)buf));
++#endif
+ }
+ #endif
+ }
+@@ -559,7 +563,7 @@ int XrdPosix_Lstat(const char *path, struct stat *buf)
+ // Return the results of an open of a Unix file
+ //
+ return (!(myPath = XrootPath.URL(path, buff, sizeof(buff)))
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ ? Xunix.Lstat64(_STAT_VER, path, (struct stat64 *)buf)
+ #else
+ ? Xunix.Lstat64( path, (struct stat64 *)buf)
+@@ -887,7 +891,7 @@ int XrdPosix_Stat(const char *path, struct stat *buf)
+ // Return the results of an open of a Unix file
+ //
+ return (!(myPath = XrootPath.URL(path, buff, sizeof(buff)))
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ ? Xunix.Stat64(_STAT_VER, path, (struct stat64 *)buf)
+ #else
+ ? Xunix.Stat64( path, (struct stat64 *)buf)
+diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
+index f298d098250..241222fa79c 100644
+--- a/src/XrdPosix/XrdPosixLinkage.hh
++++ b/src/XrdPosix/XrdPosixLinkage.hh
+@@ -116,7 +116,7 @@
+ #define Retv_Fseeko64 int
+ #define Args_Fseeko64 FILE *, off64_t, int
+
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ #define Symb_Fstat UNIX_PFX "__fxstat"
+ #define Retv_Fstat int
+ #define Args_Fstat int, int, struct stat *
+@@ -126,7 +126,7 @@
+ #define Args_Fstat int, struct stat *
+ #endif
+
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ #define Symb_Fstat64 UNIX_PFX "__fxstat64"
+ #define Retv_Fstat64 int
+ #define Args_Fstat64 int, int, struct stat64 *
+@@ -184,7 +184,7 @@
+ #define Retv_Lseek64 off64_t
+ #define Args_Lseek64 int, off64_t, int
+
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ #define Symb_Lstat UNIX_PFX "__lxstat"
+ #define Retv_Lstat int
+ #define Args_Lstat int, const char *, struct stat *
+@@ -194,7 +194,7 @@
+ #define Args_Lstat const char *, struct stat *
+ #endif
+
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ #define Symb_Lstat64 UNIX_PFX "__lxstat64"
+ #define Retv_Lstat64 int
+ #define Args_Lstat64 int, const char *, struct stat64 *
+@@ -290,7 +290,7 @@
+ #define Args_Stat const char *, struct stat *
+ #endif
+
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ #define Symb_Stat64 UNIX_PFX "__xstat64"
+ #define Retv_Stat64 int
+ #define Args_Stat64 int, const char *, struct stat64 *
+diff --git a/src/XrdPosix/XrdPosixPreload32.cc b/src/XrdPosix/XrdPosixPreload32.cc
+index 20364aaad54..fa2343afcef 100644
+--- a/src/XrdPosix/XrdPosixPreload32.cc
++++ b/src/XrdPosix/XrdPosixPreload32.cc
+@@ -230,7 +230,7 @@ int fstat( int fildes, struct stat *buf)
+ {
+ static int Init = Xunix.Init(&Init);
+
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ if (!XrdPosixXrootd::myFD(fildes)) return Xunix.Fstat(ver, fildes, buf);
+ #else
+ if (!XrdPosixXrootd::myFD(fildes)) return Xunix.Fstat( fildes, buf);
+@@ -315,7 +315,7 @@ int lstat( const char *path, struct stat *buf)
+ static int Init = Xunix.Init(&Init);
+
+ if (!XrdPosix_isMyPath(path))
+-#ifdef __linux__
++#if defined(__linux__) and defined(_STAT_VER)
+ return Xunix.Lstat(ver, path, buf);
+ #else
+ return Xunix.Lstat( path, buf);
More information about the arch-commits
mailing list