Skip to content

Commit e67465c

Browse files
committed
(Debian packaging) Backport fix for FTBFS with Sphinx 2.4
1 parent bf441c7 commit e67465c

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

debian/changelog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ mongo-c-driver (1.16.1-2) UNRELEASED; urgency=medium
55

66
-- Roberto C. Sanchez <[email protected]> Mon, 30 Mar 2020 13:29:39 -0400
77

8+
mongo-c-driver (1.16.1-1.1) unstable; urgency=high
9+
10+
* Non-maintainer upload.
11+
* Backport fix for FTBFS with Sphinx 2.4. (Closes: #955114)
12+
13+
-- Adrian Bunk <[email protected]> Thu, 18 Jun 2020 18:02:18 +0300
14+
815
mongo-c-driver (1.16.1-1) unstable; urgency=medium
916

1017
* New upstream release
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 214c433997ffbed6f36e2ba46218c5beb30a6107 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Roberto=20C=2E=20S=C3=A1nchez?= <[email protected]>
3+
Date: Mon, 30 Mar 2020 19:37:03 -0400
4+
Subject: CDRIVER-3594 build Sphinx docs without parallelism
5+
6+
---
7+
build/cmake/SphinxBuild.cmake | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/build/cmake/SphinxBuild.cmake b/build/cmake/SphinxBuild.cmake
11+
index a7f49d79b..f90308486 100644
12+
--- a/build/cmake/SphinxBuild.cmake
13+
+++ b/build/cmake/SphinxBuild.cmake
14+
@@ -40,7 +40,7 @@ function (sphinx_build_html target_name doc_dir)
15+
${CMAKE_COMMAND} -E env
16+
"PYTHONDONTWRITEBYTECODE=1"
17+
${SPHINX_EXECUTABLE}
18+
- -j ${NPROCS} -qEW -b html
19+
+ -qEW -b html
20+
-c "${CMAKE_CURRENT_SOURCE_DIR}"
21+
"${CMAKE_CURRENT_SOURCE_DIR}"
22+
"${SPHINX_HTML_DIR}"
23+
@@ -133,7 +133,7 @@ function (sphinx_build_man target_name)
24+
${CMAKE_COMMAND} -E env
25+
"PYTHONDONTWRITEBYTECODE=1"
26+
${SPHINX_EXECUTABLE}
27+
- -j ${NPROCS} -qEW -b man
28+
+ -qEW -b man
29+
-c "${CMAKE_CURRENT_SOURCE_DIR}"
30+
"${CMAKE_CURRENT_SOURCE_DIR}"
31+
"${SPHINX_MAN_DIR}"
32+
--
33+
2.20.1
34+

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0001-CDRIVER-3594-build-Sphinx-docs-without-parallelism.patch

0 commit comments

Comments
 (0)