[arch-commits] Commit in xrootd/trunk (PKGBUILD cxx17.patch)

[Konstantin Gizdov]

    Date: Friday, May 8, 2020 @ 12:15:22
  Author: kgizdov
Revision: 625611

upgpkg: xrootd 4.12.0-1

Modified:
  xrootd/trunk/PKGBUILD
  xrootd/trunk/cxx17.patch

-------------+
 PKGBUILD    |   10 +++++++---
 cxx17.patch |   16 +++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-08 12:06:40 UTC (rev 625610)
+++ PKGBUILD	2020-05-08 12:15:22 UTC (rev 625611)
@@ -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=4.11.3
+pkgver=4.12.0
 pkgrel=1
 arch=('x86_64')
 url="http://xrootd.org"
@@ -13,8 +13,8 @@
 checkdepends=('cppunit')
 source=("${url}/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'cxx17.patch')
-sha256sums=('8e7a64fd55dfb452b6d5f76a9a97c493593943227b377623a3032da9197c7f65'
-            '9cc3acec0753355772c0d0d9de40456aeb3f578c092c4fd3d38f6463d58d5103')
+sha256sums=('69ef4732256d9a88127de4bfdf96bbf73348e0c70ce1d756264871a0ffadd2fc'
+            'ad423ea5c78c89e4f048da5c0ffd0fe263a3005e6de638077fbd770de89603eb')
 
 get_pyver () {
     python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
@@ -76,4 +76,8 @@
     # 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"
 }

Modified: cxx17.patch
===================================================================
--- cxx17.patch	2020-05-08 12:06:40 UTC (rev 625610)
+++ cxx17.patch	2020-05-08 12:15:22 UTC (rev 625611)
@@ -2,21 +2,23 @@
 index 74fbe36a6..6bedbead8 100644
 --- a/bindings/python/setup.py.in
 +++ b/bindings/python/setup.py.in
-@@ -8,13 +8,13 @@ import subprocess
+@@ -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"
- 
- 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"
- 
+
+ # 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