From 22e3c9415638f2e2864e308fed3bbd634915011a Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 16 May 2019 19:06:15 +0200 Subject: linux-libre: don't build html docs to workaround build issue Without that workaround, the build fails with the following error: | Extension error: | Could not import extension kerneldoc (exception: cannot import name 'AutodocReporter' from 'sphinx.ext.autodoc' (/usr/lib/python3.7/site-packages/sphinx/ext/autodoc/__init__.py)) | make[1]: *** [Documentation/Makefile:68: htmldocs] Error 2 This commit is based on the following commit: 0e1563a070f Revert "FS#59688 - Install HTML docs" in the archlinux packages repository[1]. References: ----------- [1]git://git.archlinux.org/svntogit/packages.git Signed-off-by: Denis 'GNUtoo' Carikli --- libre/linux-libre/PKGBUILD | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'libre/linux-libre/PKGBUILD') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 6f8492b70..2e21e4dff 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -26,7 +26,7 @@ rcnrel=armv7-x8 arch=(i686 x86_64 armv7h) url='https://linux-libre.fsfla.org/' license=(GPL2) -makedepends=(xmlto kmod inetutils bc libelf python-sphinx graphviz) +makedepends=(xmlto kmod inetutils bc libelf) makedepends_armv7h=(uboot-tools vboot-utils dtc) # for linux-libre-chromebook options=('!strip') source=( @@ -163,9 +163,9 @@ prepare() { build() { cd $_srcname if [ "$CARCH" = "armv7h" ]; then - make zImage modules dtbs htmldocs + make zImage modules dtbs elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then - make bzImage modules htmldocs + make bzImage modules fi } @@ -359,18 +359,6 @@ _package-docs() { mkdir -p "$builddir" cp -t "$builddir" -a Documentation - msg2 "Removing doctrees..." - rm -r "$builddir/Documentation/output/.doctrees" - - msg2 "Moving HTML docs..." - local src dst - while read -rd '' src; do - dst="$builddir/Documentation/${src#$builddir/Documentation/output/}" - mkdir -p "${dst%/*}" - mv "$src" "$dst" - rmdir -p --ignore-fail-on-non-empty "${src%/*}" - done < <(find "$builddir/Documentation/output" -type f -print0) - msg2 "Adding symlink..." mkdir -p "$pkgdir/usr/share/doc" ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase" -- cgit v1.2.3