diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2020-03-18 03:15:41 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-03-18 03:17:23 -0300 |
| commit | b06223a31d587096bd653ab63e958b1f8cb0c489 (patch) | |
| tree | a78d0943adbeb980704b0d3911d790b1f204fe21 | |
| parent | 32fc7b7718b57155058c79703cf1714374c6b595 (diff) | |
| download | aports-b06223a31d587096bd653ab63e958b1f8cb0c489.tar.gz aports-b06223a31d587096bd653ab63e958b1f8cb0c489.tar.bz2 aports-b06223a31d587096bd653ab63e958b1f8cb0c489.tar.xz | |
testing/mongo-cxx-driver: upgrade to 3.4.1
| -rw-r--r-- | testing/mongo-cxx-driver/01-dont-build-mongo-tests.patch | 11 | ||||
| -rw-r--r-- | testing/mongo-cxx-driver/APKBUILD | 33 |
2 files changed, 16 insertions, 28 deletions
diff --git a/testing/mongo-cxx-driver/01-dont-build-mongo-tests.patch b/testing/mongo-cxx-driver/01-dont-build-mongo-tests.patch index fa34b741429..6e93a19fae9 100644 --- a/testing/mongo-cxx-driver/01-dont-build-mongo-tests.patch +++ b/testing/mongo-cxx-driver/01-dont-build-mongo-tests.patch @@ -1,13 +1,10 @@ diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index b0a2828ff..73d082480 100644 +index eaa9060..819078d 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt -@@ -194,7 +194,7 @@ if(MONGOCXX_BUILD_STATIC) - mongocxx_install(mongocxx_static) - endif() +@@ -259,4 +259,4 @@ install( + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${MONGOCXX_VERSION} + ) -add_subdirectory(test) +# add_subdirectory(test) - - set_local_dist (src_mongocxx_DIST_local - CMakeLists.txt diff --git a/testing/mongo-cxx-driver/APKBUILD b/testing/mongo-cxx-driver/APKBUILD index bb933c2bdbd..7888f5b9aec 100644 --- a/testing/mongo-cxx-driver/APKBUILD +++ b/testing/mongo-cxx-driver/APKBUILD @@ -1,30 +1,23 @@ # Contributor: Russ Webber <russ@rw.id.au> # Maintainer: Russ Webber <russ@rw.id.au> -pkgname="mongo-cxx-driver" -pkgver="3.4.0" -_commit="131fa1a67acd45c0eebcbdcfee42b212af8d2e80" # master compiles with GCC8.3/CXX17 -pkgrel=2 +pkgname=mongo-cxx-driver +pkgver=3.4.1 +pkgrel=0 pkgdesc="C++ driver for MongoDB" url="http://mongocxx.org/" arch="all" license="Apache-2.0" makedepends="cmake mongo-c-driver-dev libbson-dev openssl-dev python3 snappy-dev zstd-dev" subpackages="$pkgname-dev:_dev libbsoncxx libbsoncxx-dev" -source="mongo-cxx-driver-$pkgver.tar.gz::https://github.com/mongodb/mongo-cxx-driver/archive/$_commit.tar.gz +source="mongo-cxx-driver-$pkgver.tar.gz::https://github.com/mongodb/mongo-cxx-driver/archive/r$pkgver.tar.gz 01-dont-build-mongo-tests.patch" -builddir="$srcdir/mongo-cxx-driver-$_commit" - -prepare() { - mkdir -p "$builddir/build" - default_prepare -} +builddir="$srcdir/mongo-cxx-driver-r$pkgver" build() { - cd "$builddir/build" if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - cmake \ + cmake -B build . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ @@ -34,20 +27,18 @@ build() { -DCMAKE_CXX_STANDARD=17 \ -DBSONCXX_POLY_USE_STD=ON \ -DBUILD_VERSION="$pkgver" \ - ${CMAKE_CROSSOPTS} .. - make + $CMAKE_CROSSOPTS . + make -C build } check() { # mongo tests require a running server, so they are disabled. # libbsoncxx tests are still ran - cd "$builddir/build" - make test + make -C build test } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make -C build DESTDIR="$pkgdir" install rm -rf "$pkgdir"/usr/share/mongo-cxx-driver/ } @@ -82,5 +73,5 @@ _dev() { mv "$subpkgdir"/usr/include/bsoncxx "$pkgdir"/usr/include } -sha512sums="271807e0906ba82912c1249571e3784e600c80f0aeb7d5dc927a5784fe3584b35f830677c1634afa1818310243d4b1ae694f32e44c7c36641a4904e4236756e4 mongo-cxx-driver-3.4.0.tar.gz -2d5aa9adb75e3e9244f8b4b2769b0e3f6c92aff8b8f04bd55a0eb2c788e5e4ff24487e94c6680f37d485cd989ec4219edef942b2592e05b80c187611e225ba4f 01-dont-build-mongo-tests.patch" +sha512sums="c34d7e06946c89db88a6122ab4e7e4952bd6403ca80e57adc7d91264505e1ac1d623fe932f7b82546e26033078ab1f96bb6048a0e343b26d4b8b630658be0e71 mongo-cxx-driver-3.4.1.tar.gz +4eed3eb4236bd13eb6f80f90938481c35d6d728c7b777f2cf6e459c5b3776d612cf7d8e000fa7e5c74f741943b2900325cbcd623584081cbb931cab04ce36828 01-dont-build-mongo-tests.patch" |