openvswitch: rework disabling docs build

This is needed since openvswitch 2.13 commit 2a97891eb23b
("Documentation: Work with sphinx-build for Python 3 also.")

The 4th patch was also reworked to serve as another guard

Signed-off-by: Yousong Zhou <redacted>

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index eb5776b4963847b31e1c2af1905bdc9ffa28e2b8..73dbb3012c088b201210abf91d9ea5078c7ab211 100644 (file)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -257,7 +257,7 @@ CONFIGURE_VARS += \
        ovs_cv_flake8=no \
        ovs_cv_python3=$(PYTHON3) \
        ovs_cv_python3_host=$(HOST_PYTHON3_BIN) \
-       ovs_cv_sphinx=no \
+       SPHINXBUILD=none \
        KARCH=$(LINUX_KARCH) \
 
 ovs_intree_kmod_configs:=CONFIG_PACKAGE_kmod-openvswitch-intree

diff --git a/net/openvswitch/patches/0004-build-disable-building-tests.patch b/net/openvswitch/patches/0004-build-trim-build.patch
similarity index 53%
rename from net/openvswitch/patches/0004-build-disable-building-tests.patch
rename to net/openvswitch/patches/0004-build-trim-build.patch
index 577181ef3bbe32e54ca5fd02396d1d6f02390c95..05fc8b8305f1e4a1544bdf41cc100839e700d97a 100644 (file)
--- a/net/openvswitch/patches/0004-build-disable-building-tests.patch
+++ b/net/openvswitch/patches/0004-build-trim-build.patch
@@ -1,18 +1,23 @@
-From 46c5ce605b19fd6a782559bda8c90a663bf36014 Mon Sep 17 00:00:00 2001
+From 3ee8ab22699b503b591b6abb4a2db89ac1881ea6 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <zhouyousong@yunionyun.com>
 Date: Tue, 21 Aug 2018 13:02:21 +0000
-Subject: [PATCH] build: disable building tests
+Subject: [PATCH] build: trim build
 
 Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com>
 ---
- Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
+ Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 6140b2c7f..03c65796f 100644
+index 6140b2c7f..d9f9457fa 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -480,7 +480,6 @@ include m4/automake.mk
+@@ -475,12 +475,10 @@ dist-docs:
+       VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs $(srcdir) $(docs)
+ .PHONY: dist-docs
+ 
+-include Documentation/automake.mk
+ include m4/automake.mk
  include lib/automake.mk
  include ofproto/automake.mk
  include utilities/automake.mk