[arch-commits] Commit in xrootd/trunk (PKGBUILD fix_signness.patch)
Konstantin Gizdov
kgizdov at archlinux.org
Sun Mar 3 13:00:02 UTC 2019
Date: Sunday, March 3, 2019 @ 13:00:02
Author: kgizdov
Revision: 437456
update to v 4.9.0
Added:
xrootd/trunk/fix_signness.patch
Modified:
xrootd/trunk/PKGBUILD
--------------------+
PKGBUILD | 136 +++++++--------------------------------------------
fix_signness.patch | 44 ++++++++++++++++
2 files changed, 64 insertions(+), 116 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-03 12:40:18 UTC (rev 437455)
+++ PKGBUILD 2019-03-03 13:00:02 UTC (rev 437456)
@@ -1,11 +1,11 @@
# 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 >
-pkgbase=xrootd
-pkgname=('xrootd' 'python-xrootd' 'python-pyxrootd' 'python2-xrootd' 'python2-pyxrootd')
+pkgname=xrootd
+provides=('python-xrootd' 'python-pyxrootd')
pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
-pkgver=4.8.5
-pkgrel=6
+pkgver=4.9.0
+pkgrel=1
arch=('x86_64')
url="http://xrootd.org"
license=('LGPL3')
@@ -12,9 +12,20 @@
depends=('ceph' 'python' 'cppunit')
makedepends=('ceph' 'cmake' 'python')
checkdepends=('cppunit')
-source=("${url}/download/v${pkgver}/xrootd-${pkgver}.tar.gz")
-sha256sums=('42e4d2cc6f8b442135f09bcc12c7be38b1a0c623a005cb5e69ff3d27997bdf73')
+source=("${url}/download/v${pkgver}/xrootd-${pkgver}.tar.gz"
+ fix_signness.patch)
+sha256sums=('49791648bdc99ad87545f60d1808dacf926de7b843415ebdd181ccf43b2af8be'
+ 'f291968f0e17168330a422b43c92f1c2ec33f9c058f3310839ceeecff5e25f62')
+get_pyver () {
+ python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))'
+}
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -Np1 -i "${srcdir}"/fix_signness.patch
+}
+
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -28,48 +39,12 @@
cmake -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_INSTALL_LIBDIR:PATH=lib \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DBUILD_TESTS=1 \
- -DCPPUNIT_FOUND=1 \
- -DCPPUNIT_INCLUDE_DIRS=/usr/include \
- -DCPPUNIT_LIBRARIES=/usr/lib/libcppunit.so \
- -DXRD_PYTHON_REQ_VERSION=$( python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' ) \
+ -DENABLE_TESTS=1 \
+ -DXRD_PYTHON_REQ_VERSION=$(get_pyver) \
"${srcdir}/${pkgbase}-${pkgver}"
- cd "${srcdir}"
- mv "${srcdir}/build" "${srcdir}/build-py3"
- 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 \
- -DBUILD_TESTS=1 \
- -DCPPUNIT_FOUND=1 \
- -DCPPUNIT_INCLUDE_DIRS=/usr/include \
- -DCPPUNIT_LIBRARIES=/usr/lib/libcppunit.so \
- -DXRD_PYTHON_REQ_VERSION=$( python2 -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))' ) \
- "${srcdir}/${pkgbase}-${pkgver}"
- mv "${srcdir}/build/bindings/python" "${srcdir}/build-py3/bindings/python2"
-
# build
- cd "${srcdir}"
- rm -rf "${srcdir}/build"
- mv "${srcdir}/build-py3" "${srcdir}/build"
- cd "${srcdir}/build"
-
- # Python2 bindings first
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python3"
- mv "${srcdir}/build/bindings/python2" "${srcdir}/build/bindings/python"
make
-
- # Python bindings second
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python2"
- mv "${srcdir}/build/bindings/python3" "${srcdir}/build/bindings/python"
- make -f "bindings/python/Makefile"
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python3"
}
check() {
@@ -94,78 +69,7 @@
# ./common/text-runner ./XrdClTests/libXrdClTests.so "All Tests"
}
-package_xrootd() {
- pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
+package() {
cd "${srcdir}/build"
-
- # Python first
- mv "${srcdir}/build/bindings/python3" "${srcdir}/build/bindings/python"
make DESTDIR="${pkgdir}" install
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python3"
-
- rm -rf "${pkgdir}/usr/lib"/python*
}
-
-package_python-xrootd() {
- pkgdesc="Python Client API for XRootD"
- depends=('xrootd')
- cd "${srcdir}/build"
-
- # Python3
- mv "${srcdir}/build/bindings/python3" "${srcdir}/build/bindings/python"
- make -f "bindings/python/Makefile" DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/lib/"lib*.so*
- rm -rf "${pkgdir}/usr/lib/"python*/site-packages/pyxrootd*
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python3"
-}
-
-package_python-pyxrootd() {
- pkgdesc="Python bindings for XRootD"
- depends=('python-xrootd')
- cd "${srcdir}/build"
-
- # Python3
- mv "${srcdir}/build/bindings/python3" "${srcdir}/build/bindings/python"
- make -f "bindings/python/Makefile" DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/lib/"lib*.so*
- rm -rf "${pkgdir}/usr/lib/"python*/site-packages/XRootD
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python3"
-}
-
-package_python2-xrootd() {
- pkgdesc="Python2 Client API for XRootD"
- depends=('xrootd')
- cd "${srcdir}/build"
-
- # Python2
- mv "${srcdir}/build/bindings/python2" "${srcdir}/build/bindings/python"
- make -f "bindings/python/Makefile" DESTDIR="${pkgdir}" install
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python2"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/lib/"lib*.so*
- rm -rf "${pkgdir}/usr/lib/"python*/site-packages/pyxrootd*
-}
-
-package_python2-pyxrootd() {
- pkgdesc="Python2 bindings for XRootD"
- depends=('python2-xrootd')
- cd "${srcdir}/build"
-
- # Python3
- mv "${srcdir}/build/bindings/python2" "${srcdir}/build/bindings/python"
- make -f "bindings/python/Makefile" DESTDIR="${pkgdir}" install
- mv "${srcdir}/build/bindings/python" "${srcdir}/build/bindings/python2"
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/share"
- rm -rf "${pkgdir}/usr/lib/"lib*.so*
- rm -rf "${pkgdir}/usr/lib/"python*/site-packages/XRootD
-}
Added: fix_signness.patch
===================================================================
--- fix_signness.patch (rev 0)
+++ fix_signness.patch 2019-03-03 13:00:02 UTC (rev 437456)
@@ -0,0 +1,44 @@
+From 8e5940a2ebeb74d186a848da3bc21f1fa77c8835 Mon Sep 17 00:00:00 2001
+From: Konstantin Gizdov <kgizdov at gmail.com>
+Date: Sun, 3 Mar 2019 14:46:41 +0200
+Subject: [PATCH] fix signness and tests
+
+---
+ src/XrdCl/XrdClParallelOperation.hh | 4 ++--
+ tests/XrdClTests/OperationsWorkflowTest.cc | 6 ------
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/src/XrdCl/XrdClParallelOperation.hh b/src/XrdCl/XrdClParallelOperation.hh
+index 2bd13b63e43..897fae78a86 100644
+--- a/src/XrdCl/XrdClParallelOperation.hh
++++ b/src/XrdCl/XrdClParallelOperation.hh
+@@ -89,10 +89,10 @@ namespace XrdCl
+ {
+ std::ostringstream oss;
+ oss << "Parallel(";
+- for( int i = 0; i < pipelines.size(); i++ )
++ for( size_t i = 0; i < pipelines.size(); i++ )
+ {
+ oss << pipelines[i]->ToString();
+- if( i != pipelines.size() - 1 )
++ if( i + 1 != pipelines.size() )
+ {
+ oss << " && ";
+ }
+diff --git a/tests/XrdClTests/OperationsWorkflowTest.cc b/tests/XrdClTests/OperationsWorkflowTest.cc
+index 26b1b517519..5e09b6689d1 100644
+--- a/tests/XrdClTests/OperationsWorkflowTest.cc
++++ b/tests/XrdClTests/OperationsWorkflowTest.cc
+@@ -157,12 +157,6 @@ namespace {
+ bool executed;
+ };
+
+- char* createBuf(const char* content, uint32_t length){
+- char* buf = new char[length + 1]();
+- strncpy(buf, content, length);
+- return buf;
+- }
+-
+
+
+ }
More information about the arch-commits
mailing list