aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Daudt <kdaudt@alpinelinux.org>2020-05-04 21:24:28 +0000
committerKevin Daudt <kdaudt@alpinelinux.org>2020-05-04 21:24:28 +0000
commit656897bf17a21c9fd9e5f3f2aa9b41d4f3335de9 (patch)
treed3ce51974f325c5c517d7c80b3d05fe117bc85cc
parent314f57b328229dcb19695f49631d25735dea5296 (diff)
downloadaports-656897bf17a21c9fd9e5f3f2aa9b41d4f3335de9.tar.gz
aports-656897bf17a21c9fd9e5f3f2aa9b41d4f3335de9.tar.bz2
aports-656897bf17a21c9fd9e5f3f2aa9b41d4f3335de9.tar.xz
community/mongo-c-driver: fix ftbts
Build fails with: "the taglist extension is not safe for parallel reading" See: https://jira.mongodb.org/browse/CDRIVER-3594
-rw-r--r--community/mongo-c-driver/APKBUILD7
-rw-r--r--community/mongo-c-driver/sphinx-taglist-no-parrallel.patch34
2 files changed, 39 insertions, 2 deletions
diff --git a/community/mongo-c-driver/APKBUILD b/community/mongo-c-driver/APKBUILD
index 9afbdf039c..802e90c7ab 100644
--- a/community/mongo-c-driver/APKBUILD
+++ b/community/mongo-c-driver/APKBUILD
@@ -15,7 +15,9 @@ subpackages="
libbson
libbson-dev
"
-source="https://github.com/mongodb/mongo-c-driver/releases/download/$pkgver/mongo-c-driver-$pkgver.tar.gz"
+source="https://github.com/mongodb/mongo-c-driver/releases/download/$pkgver/mongo-c-driver-$pkgver.tar.gz
+ sphinx-taglist-no-parrallel.patch
+ "
build() {
mkdir -p "$srcdir"/build
@@ -119,4 +121,5 @@ _dev() {
mv "$subpkgdir"/usr/include/libbson-1.0 "$pkgdir"/usr/include
}
-sha512sums="0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a mongo-c-driver-1.16.2.tar.gz"
+sha512sums="0930a80692f08329cad558644c25c46da64a0c8b6a9fc7412db0f547dae63bf59e9d29ee774d329c63af186eea751670bf21ccee8cf255f8bc8d5bd78c0e736a mongo-c-driver-1.16.2.tar.gz
+97c1a29ffa9ec30cc2ce555bce05531696f37cc9a00166860d4506538be0b71b742ff8354f7a486abda3a3da2dd248c175edaede227586881016fcb69f150d5d sphinx-taglist-no-parrallel.patch"
diff --git a/community/mongo-c-driver/sphinx-taglist-no-parrallel.patch b/community/mongo-c-driver/sphinx-taglist-no-parrallel.patch
new file mode 100644
index 0000000000..5c566a7d3c
--- /dev/null
+++ b/community/mongo-c-driver/sphinx-taglist-no-parrallel.patch
@@ -0,0 +1,34 @@
+Upstream: yes
+Reason: ftbts "the taglist extension is not safe for parallel reading"
+Url: https://jira.mongodb.org/browse/CDRIVER-3594
+From 214c433997ffbed6f36e2ba46218c5beb30a6107 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= <roberto@connexer.com>
+Date: Mon, 30 Mar 2020 19:37:03 -0400
+Subject: [PATCH] CDRIVER-3594 build Sphinx docs without parallelism
+
+---
+ build/cmake/SphinxBuild.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/cmake/SphinxBuild.cmake b/build/cmake/SphinxBuild.cmake
+index a7f49d79b..f90308486 100644
+--- a/build/cmake/SphinxBuild.cmake
++++ b/build/cmake/SphinxBuild.cmake
+@@ -40,7 +40,7 @@ function (sphinx_build_html target_name doc_dir)
+ ${CMAKE_COMMAND} -E env
+ "PYTHONDONTWRITEBYTECODE=1"
+ ${SPHINX_EXECUTABLE}
+- -j ${NPROCS} -qEW -b html
++ -qEW -b html
+ -c "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${SPHINX_HTML_DIR}"
+@@ -133,7 +133,7 @@ function (sphinx_build_man target_name)
+ ${CMAKE_COMMAND} -E env
+ "PYTHONDONTWRITEBYTECODE=1"
+ ${SPHINX_EXECUTABLE}
+- -j ${NPROCS} -qEW -b man
++ -qEW -b man
+ -c "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}"
+ "${SPHINX_MAN_DIR}"