From patchwork Fri May 14 23:12:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Adair X-Patchwork-Id: 1478743 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1:d65d:64ff:fe57:4e05; helo=desiato.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=ULcyi3dK; dkim-atps=neutral Received: from desiato.infradead.org (desiato.infradead.org [IPv6:2001:8b0:10b:1:d65d:64ff:fe57:4e05]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FhkrJ47Cwz9sWC for ; Sat, 15 May 2021 09:14:40 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Type:List-Help: Reply-To:List-Archive:List-Unsubscribe:List-Subscribe:From:List-Post:List-Id: Message-ID:MIME-Version:References:In-Reply-To:Date:To:Subject:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZIUcIoYGlaR1UY5Fp5uPHyt2TrV7NVRU1TpE8qKr0mQ=; b=ULcyi3dKGYCDQftqsNMQkh9wi Gk5W46Y/9b2BDQNsQzXYkyyDZqKYnx/WeVaewGsuDYyeiO+1CDOCT/mdnVs4VeaR5isl+pjMXuOIW uO16VSic8wwqLaqCNR+8Dm9k5Szmt4u081MzR7Lkl20UGyU5wZ7uS7RAb3B+lseidir1OZn+CPLqG ulgPz//YHjKQWfhiI0l9DTZyR9t4wh8Q+JB9Bb2V43G2gRiyWUUoiychSd5p9/ZIedQz0K5728Cb2 5zt363L9eKWHNKV2zac4q8jmT3giHzmMBKyhpyjW3a8mrl+u0KKr2a97ecysF2THNgXXG3yyBt7xu LuOdVyGPQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhgzc-009F3K-3i; Fri, 14 May 2021 23:13:16 +0000 Subject: [PATCH 3/3] ccache: Add 030-make-documentation-optional.patch To: openwrt-devel@lists.openwrt.org Date: Fri, 14 May 2021 16:12:56 -0700 In-Reply-To: <7ccbf4ea6c521d368ed1f8f7b2bf7f9c6b75931a.camel@aol.com> References: <63d45d708e6409ec071edcbf3eaefdc7fbd290ab.camel.ref@aol.com> MIME-Version: 1.0 Message-ID: List-Id: OpenWrt Development List List-Post: X-Patchwork-Original-From: David Adair via openwrt-devel From: David Adair Precedence: list X-Mailman-Version: 2.1.34 X-BeenThere: openwrt-devel@lists.openwrt.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: David Adair List-Help: Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Added patch 030-make-documentation-optional.patch to include upstream commit: b96ca763c453a602 which allows us to avoid the build failures due to non-ascii characters in the documentation. Since we don't need docs anyway it is easier to just build with -D ENABLE_DOCUMENTATION=OFF rather than attempt to fix the docs which break from time to time. This patch is only required for the 21.02 branch since other branches do not have the non-ascii character build failures at this time. By the time they *did* have a problem they would also include this change. Note: patch itself is not my work it is: Signed-off-by: Petr Štetiar Signed-off-by: David Adair --- .../030-make-documentation-optional.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tools/ccache/patches/030-make-documentation-optional.patch + diff --git a/tools/ccache/patches/030-make-documentation-optional.patch b/tools/ccache/patches/030-make-documentation-optional.patch new file mode 100644 index 0000000000..ccd25067cb --- /dev/null +++ b/tools/ccache/patches/030-make-documentation-optional.patch @@ -0,0 +1,37 @@ +From b96ca763c453a602b5516b4b9ca5e2829528e318 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0tetiar?= +Date: Mon, 3 May 2021 18:44:53 +0200 +Subject: [PATCH] CMake: make build of documentation optional (#842) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +So we don't need to support corner cases as for example one fixed in +commit f6202db308e3 ("doc/MANUAL.adoc: Don't use non-ASCII quotes +(#761)") when the documentation is actually not needed at all as ccache +is used as a build tool only. + +Signed-off-by: Petr Štetiar +--- + CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0825f2af..e186e812 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,7 +133,10 @@ target_link_libraries(ccache PRIVATE standard_settings standard_warnings ccache_ + # + # Documentation + # +-add_subdirectory(doc) ++option(ENABLE_DOCUMENTATION "Enable documentation" ON) ++if(ENABLE_DOCUMENTATION) ++ add_subdirectory(doc) ++endif() + + # + # Installation +-- +2.27.0