Date: Wednesday, July 8, 2020 @ 19:13:50 Author: mtorromeo Revision: 661761
Added benchmark as dependency for grpc Added: benchmark/ benchmark/trunk/ benchmark/trunk/PKGBUILD Modified: grpc/trunk/PKGBUILD python-ujson/trunk/PKGBUILD salt/trunk/PKGBUILD -----------------------------+ benchmark/trunk/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++++ grpc/trunk/PKGBUILD | 34 +++++++++++++++------------------- python-ujson/trunk/PKGBUILD | 10 +++++----- salt/trunk/PKGBUILD | 40 +++++++++++++++++++++++----------------- 4 files changed, 83 insertions(+), 41 deletions(-) Added: benchmark/trunk/PKGBUILD =================================================================== --- benchmark/trunk/PKGBUILD (rev 0) +++ benchmark/trunk/PKGBUILD 2020-07-08 19:13:50 UTC (rev 661761) @@ -0,0 +1,40 @@ +# Maintainer: Massimiliano Torromeo <massimiliano.torro...@gmail.com> +# Contributor: Philipp Claßen <philipp.clas...@posteo.de> + +pkgname=benchmark +pkgver=1.5.1 +pkgrel=1 +pkgdesc="A microbenchmark support library" +arch=('x86_64') +url="https://github.com/google/benchmark" +license=('Apache') +depends=('gcc-libs') +makedepends=('cmake') + +source=("https://github.com/google/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('23082937d1663a53b90cb5b61df4bcc312f6dee7018da78ba00dd6bd669dfef2') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -p build +} + +build() { + cd "$srcdir/$pkgname-$pkgver/build" + + cmake \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=ON \ + -DBENCHMARK_ENABLE_LTO=ON \ + -DBENCHMARK_ENABLE_GTEST_TESTS=OFF \ + .. + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir/" install +} Modified: grpc/trunk/PKGBUILD =================================================================== --- grpc/trunk/PKGBUILD 2020-07-08 19:09:54 UTC (rev 661760) +++ grpc/trunk/PKGBUILD 2020-07-08 19:13:50 UTC (rev 661761) @@ -4,10 +4,9 @@ pkgbase='grpc' pkgname=('grpc' 'python-grpcio' 'php-grpc' 'grpc-cli') -pkgver=1.29.1 +pkgver=1.30.0 _gtestver=c9ccac7cb7345901884aabf5d1a786cfa6e2f397 _abseilcppver=20200225.2 -_gbenchmark=1.5.0 pkgrel=1 pkgdesc="High performance, open source, general RPC framework that puts mobile and HTTP/2 first." arch=('x86_64') @@ -14,17 +13,15 @@ url='https://grpc.io' license=('BSD') makedepends=('re2c' 'protobuf' 'php' 'c-ares' 'openssl' 'chrpath' 'gflags' 'cython' 'cmake') -source=("https://github.com/$pkgname/$pkgname/archive/v$pkgver/$pkgname-$pkgver.tar.gz" +source=("https://github.com/grpc/grpc/archive/v$pkgver/$pkgbase-$pkgver.tar.gz" "https://github.com/google/googletest/archive/$_gtestver/googletest-$_gtestver.tar.gz" - "https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz" - "https://github.com/google/benchmark/archive/v$_gbenchmark/google-benchmark-$_gbenchmark.tar.gz") -sha256sums=('0343e6dbde66e9a31c691f2f61e98d79f3584e03a11511fad3f10e3667832a45' + "https://github.com/abseil/abseil-cpp/archive/$_abseilcppver/abseil-cpp-$_abseilcppver.tar.gz") +sha256sums=('419dba362eaf8f1d36849ceee17c3e2ff8ff12ac666b42d3ff02a164ebe090e9' '443d383db648ebb8e391382c0ab63263b7091d03197f304390baac10f178a468' - 'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111' - '3c6a165b6ecc948967a1ead710d4a181d7b0fbcaa183ef7ea84604994966221a') + 'f41868f7a938605c92936230081175d1eae87f6ea2c248f41077c8f88316f111') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" ln -sf "$srcdir/googletest-$_gtestver/"{googlemock,googletest} \ third_party/googletest @@ -31,14 +28,16 @@ rm -rf third_party/abseil-cpp ln -s "$srcdir/abseil-cpp-$_abseilcppver/" third_party/abseil-cpp - rm -rf third_party/benchmark - ln -s "$srcdir/benchmark-$_gbenchmark/" third_party/benchmark - sed '/TARGET gflags::gflags/i \ set(_gRPC_GFLAGS_LIBRARIES gflags)' -i cmake/gflags.cmake mkdir build - cd build +} + +build() { + cd "$srcdir/$pkgbase-$pkgver/build" cmake \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_CXX_FLAGS=-DNDEBUG \ -DgRPC_INSTALL=ON \ -DBUILD_SHARED_LIBS=ON \ -DgRPC_BUILD_TESTS=ON \ @@ -48,12 +47,9 @@ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ -DgRPC_GFLAGS_PROVIDER=package \ - -DBENCHMARK_HAS_CXX03_FLAG=OFF \ + -DgRPC_BENCHMARK_PROVIDER=package \ .. -} -build() { - cd "$srcdir/$pkgname-$pkgver/build" make export LDFLAGS="$LDFLAGS -L$PWD" @@ -60,11 +56,11 @@ # PHP cd "$srcdir/$pkgbase-$pkgver/src/php/ext/$pkgbase" phpize - ./configure --enable-grpc="$srcdir/$pkgname-$pkgver" + ./configure --enable-grpc="$srcdir/$pkgbase-$pkgver" make # Python - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" GRPC_PYTHON_BUILD_WITH_CYTHON=1 \ GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1 \ GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1 \ Modified: python-ujson/trunk/PKGBUILD =================================================================== --- python-ujson/trunk/PKGBUILD 2020-07-08 19:09:54 UTC (rev 661760) +++ python-ujson/trunk/PKGBUILD 2020-07-08 19:13:50 UTC (rev 661761) @@ -4,17 +4,17 @@ pkgbase=python-ujson pkgname=('python-ujson' 'python2-ujson') _pkgname=ultrajson -pkgver=2.0.3 +pkgver=3.0.0 pkgrel=1 pkgdesc="Ultra fast JSON encoder and decoder for Python" -url="https://github.com/esnme/ultrajson" +url="https://github.com/ultrajson/ultrajson" arch=('x86_64') license=('BSD') makedepends=('python-setuptools' 'python2-setuptools' 'python-pip' 'python2-pip') checkdepends=('python-six' 'python-pytest') -source=(https://github.com/esnme/ultrajson/archive/$pkgver/$pkgname-$pkgver.tar.gz) -sha512sums=('31ccee759847424de1d683bb8b55554898ea2b358a3c48524f4f455aa0c5d732d0edf84bd5fa0c203ca9c58b4fbc6d94130f447c1cbae564dc60e4863b17dad8') -b2sums=('063aa628c9d06f0dcebd73ee044ec3458d0613d2ff7e97b33d7b187ebc9557e9ab53d7db5ba987e2acf374ed3c2a9e7d0d5163a22e2d2bd691789711487ce52a') +source=(https://github.com/ultrajson/ultrajson/archive/$pkgver/$pkgname-$pkgver.tar.gz) +sha512sums=('bd77fd9ba4c1f059216be46afced3db20b82b8637c5d41fe5ba04b9d63e636c422cae44a7fcee913dc40fc9d91367f2de97db757e4cb53b22ecb77b1c765e27d') +b2sums=('e15895072e44e0f54a7437fe5613aff3fa912f7d19f3058bb4977cf407d8b2a3d0c8c94526459bfbbccbcff56737c76be880bd3385776c8a771dba0194c8e0e7') prepare() { sed '/setup_requires=\["setuptools_scm"\],/d' -i ${_pkgname}-${pkgver}/setup.py Modified: salt/trunk/PKGBUILD =================================================================== --- salt/trunk/PKGBUILD 2020-07-08 19:09:54 UTC (rev 661760) +++ salt/trunk/PKGBUILD 2020-07-08 19:13:50 UTC (rev 661761) @@ -4,8 +4,8 @@ # Contributor: Christer Edwards <christer.edwa...@gmail.com> pkgname=salt -pkgver=2019.2.4 -pkgrel=1 +pkgver=3001 +pkgrel=2 pkgdesc='Central system and configuration manager' arch=('any') @@ -15,19 +15,19 @@ replaces=('salt-zmq' 'salt-raet') conflicts=('salt-zmq' 'salt-raet') -depends=('python2-jinja' - 'python2-msgpack' - 'python2-yaml' - 'python2-markupsafe' - 'python2-requests' - 'python2-pyzmq' - 'python2-crypto' - 'python2-m2crypto' - 'python2-systemd' - 'python2-tornado' - 'python2-futures') +depends=('python-jinja' + 'python-msgpack' + 'python-yaml' + 'python-markupsafe' + 'python-requests' + 'python-pyzmq' + 'python-pycryptodome' + 'python-pycryptodomex' + 'python-m2crypto' + 'python-systemd' + 'python-distro') optdepends=('dmidecode: decode SMBIOS/DMI tables' - 'python2-pygit2: gitfs support') + 'python-pygit2: gitfs support') backup=('etc/logrotate.d/salt' 'etc/salt/master' @@ -37,12 +37,18 @@ source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz" salt.logrotate) -sha256sums=('afeb1c95db61c9008f95259c0b27e525c8a9957cbc6f51c40e824a92637d2847' +sha256sums=('5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154' 'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215') +prepare() { + cd salt-$pkgver + find requirements salt.egg-info/requires.txt -type f -name \*.txt -exec \ + sed -r 's;^pycrypto\b.*;pycryptodome;' -i {} + +} + build() { cd salt-$pkgver - python2 setup.py build + python setup.py build } package() { @@ -49,7 +55,7 @@ install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt cd salt-$pkgver - python2 setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 --skip-build + python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 --skip-build # default config install -Dm644 conf/master "$pkgdir/etc/salt/master"