From patchwork Thu Apr 22 18:24:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1469357 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Xw/u7plB; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 4FR5SM6vjpz9sW5 for ; Fri, 23 Apr 2021 04:25:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 97D9C608F1; Thu, 22 Apr 2021 18:25:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e-Anr5B54ZyI; Thu, 22 Apr 2021 18:25:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C87266067D; Thu, 22 Apr 2021 18:25:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 936421BF37A for ; Thu, 22 Apr 2021 18:25:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8278983CFD for ; Thu, 22 Apr 2021 18:25:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 42UvHOo3ffVw for ; Thu, 22 Apr 2021 18:24:59 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2753883CFB for ; Thu, 22 Apr 2021 18:24:59 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id c4so6851215wrt.8 for ; Thu, 22 Apr 2021 11:24:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9q54m60GjN/hvlf3TVRPL5p6oRi4olX/BalsdEytgqw=; b=Xw/u7plBLz8RybeZQ2Mj0rGZ8iy1noxJSCqFRtFFDBm5uaSf/UN+56Psqg+Oe7+/ay TmZ477JnlWIqV88oagI4U6rUgwv8Inr6viG7LujgBYPYjqPrPoQyfzCiPhw2wK9AM26h Q5FWi1a/XcHzl1RXw8NA39Xm45trET5Nkr6wkEgdecUUs5k53Kyw+pSgA770AOPF3XRQ CfKJx5nNxPd4DkmV8ZXVyrfBDgJcPx1Gtez2TxBymsL87D9+j0JMzkxL0k6MaNz44IIq bdmmDTrjO9tHDyeDa1JZwXsyXsh7Yz2ZRdCI70t6CrDy6qno0E8Oqz43gTRgte+LMv6V xKDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=9q54m60GjN/hvlf3TVRPL5p6oRi4olX/BalsdEytgqw=; b=dsQVydsYQyOMDP1ppzZJuRkfJzD3xp7PH8e6O5flPGva8Nb6ghwqkOzuNlWengTXDO mglJR0igze6N7YKMH2V5twUPLz8rAc0J3SCyVdypq/cgqUIDqrj4J5jEp18A6sYuAwlI ILdgoLDH3bMOD+4Ak6FOCBUnB900YCBjUctPQwYSMzaG5zs9V7eebB0b3MYr4iIe0BzF /P1kisZm/DM6Zq6hVjgRfZeL1ckbHbfdY+UbndDc9fHwv2di9Iy1/hIMoGbN/e18rAeK 6Od0xRH4u/gcgG7vinQtQDimCNs174QNN/Ito6BvTyHgyD64ym+ADxwoNslLl1XHXwdT AASg== X-Gm-Message-State: AOAM5330EJzqQBp8zW/R5v3tUesQDAkulb+UdecyFMNMSQDtiPa4OhLD boVZ4qt3BzdRQtS2GywYFb1RHGKT6PM= X-Google-Smtp-Source: ABdhPJxBnbFQz6I6z1bLogLtoljk0TZ4fi4pvLmP24glWyyBwVBGEpFdSlG1tZ277hCbty4RQ/WIUA== X-Received: by 2002:a5d:40c1:: with SMTP id b1mr5952046wrq.33.1619115897157; Thu, 22 Apr 2021 11:24:57 -0700 (PDT) Received: from kali.home (lfbn-ren-1-1383-171.w86-229.abo.wanadoo.fr. [86.229.230.171]) by smtp.gmail.com with ESMTPSA id x23sm4230563wmj.43.2021.04.22.11.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 11:24:56 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 22 Apr 2021 20:24:43 +0200 Message-Id: <20210422182443.654635-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/protozero: disable tests X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Kochetkov , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add a patch to disable tests through the standard BUILD_TESTING variable which is already passed by cmake-package. While at it, drop protobuf dependency which is only needed for tests This will fix a build failure on toolchains without wchar, toolchains for sh4 (ICE) or toolchains where gcc is affected by bug 64735. Upstream thinks that this is unecessary but no additional feedback was received on how we should handle those build failures Fixes: - http://autobuild.buildroot.org/results/1cd24b757d87b963c70bc7ff927c6d983d0b142a Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov --- ...CMakeLists.txt-respect-BUILD_TESTING.patch | 47 +++++++++++++++++++ package/protozero/protozero.mk | 4 -- 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch diff --git a/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch b/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch new file mode 100644 index 0000000000..d0267e3283 --- /dev/null +++ b/package/protozero/0001-CMakeLists.txt-respect-BUILD_TESTING.patch @@ -0,0 +1,47 @@ +From 03daae49c8fa94513b508bd12f1597e8e5e086f2 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 17 Apr 2021 13:06:44 +0200 +Subject: [PATCH] CMakeLists.txt: respect BUILD_TESTING + +Don't build tests if the standard cmake BUILD_TESTING variable is set to +OFF. + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/mapbox/protozero/pull/105] +--- + CMakeLists.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f9702d6..7a40212 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,6 +23,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + + #----------------------------------------------------------------------------- + ++option(BUILD_TESTING "Build tests" ON) + option(WERROR "Add -Werror flag to build (turns warnings into errors)" ON) + + if(MSVC) +@@ -134,13 +135,13 @@ install(DIRECTORY include/protozero DESTINATION include) + + #----------------------------------------------------------------------------- + +-enable_testing() +- + add_subdirectory(doc) + + add_subdirectory(tools) + +-add_subdirectory(test) +- ++if(BUILD_TESTING) ++ enable_testing() ++ add_subdirectory(test) ++endif() + + #----------------------------------------------------------------------------- +-- +2.30.2 + diff --git a/package/protozero/protozero.mk b/package/protozero/protozero.mk index e4ce1a4730..80d16192e3 100644 --- a/package/protozero/protozero.mk +++ b/package/protozero/protozero.mk @@ -10,8 +10,4 @@ PROTOZERO_LICENSE = BSD-2-Clause, Apache-2.0 PROTOZERO_LICENSE_FILES = LICENSE.md LICENSE.from_folly PROTOZERO_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_PROTOBUF),y) -PROTOZERO_DEPENDENCIES += protobuf -endif - $(eval $(cmake-package))