From patchwork Thu Nov 7 19:16:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 2008136 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XksL63QYbz1xyd for ; Fri, 8 Nov 2024 06:18:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A95A284367; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id UfR2wg7e_3-2; Thu, 7 Nov 2024 19:18:10 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AE28C84370 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id AE28C84370; Thu, 7 Nov 2024 19:18:10 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id 13A27C0 for ; Thu, 7 Nov 2024 19:18:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0234961153 for ; Thu, 7 Nov 2024 19:18:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id oTDQmQPZj0LS for ; Thu, 7 Nov 2024 19:18:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::d32; helo=mail-io1-xd32.google.com; envelope-from=james.hilliard1@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org E1F00610FE DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E1F00610FE Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) by smtp3.osuosl.org (Postfix) with ESMTPS id E1F00610FE for ; Thu, 7 Nov 2024 19:18:08 +0000 (UTC) Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-83aae6aba1aso49885139f.2 for ; Thu, 07 Nov 2024 11:18:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731007087; x=1731611887; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zM9t/VnpApDt+lLSlsR/BBGi5z11GfUyukR0JXhsNso=; b=olr9vGESzxUtB150ba+0BKELv9o2wLb5MPfi7awBu0VMvWdK+I/2uMofA+QhDyrd4D 6RY1A17gbrNvIo8Yyn5Jzw3cCch2/B6kmXHz/0bNX1Mve+oZAmkr8O2SjorPQRejW+TW XXBfT6SEXNU9xphWWyGkwEMBCRGsi6cUk7M4i+cttaeBm4Ft1P6sxLsH6rierxDAIzwn 4Dm+DX2GgFUlMV16WbFf2DGh936gjdnRill1anHLe8MpTI6d5r5mI+7s6JreBIpP/Pte kVkdgMlK9NjbwRnbCzgeCZzxoOPR4pqPGGLs888GmYqxVDLfzpoNvjSzbDsLMDvGzZNc z9bw== X-Gm-Message-State: AOJu0Yyv78HfGZJvVnb3zK52JPocrz65ItOGG0U5Wkvgu02hlmYWAHwy oEgj91K7rji4B8Sda04E2LHn+5cvvkVBSoIxhXk0ZuzOKojfdFGV9zO8qg== X-Google-Smtp-Source: AGHT+IFB4ClfjctzLS9TF0gkzWseLyrirc/gWBDuPHIdhIuuNTfajqPvqWShc88RBYY0bi2h6dk/GA== X-Received: by 2002:a05:6602:6b08:b0:83a:a82b:f855 with SMTP id ca18e2360f4ac-83e032e05aamr1962539f.9.1731007087539; Thu, 07 Nov 2024 11:18:07 -0800 (PST) Received: from james-x399.localdomain (97-118-149-1.hlrn.qwest.net. [97.118.149.1]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de5f8cdd00sm441546173.108.2024.11.07.11.18.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 11:18:07 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Thu, 7 Nov 2024 12:16:31 -0700 Message-Id: <20241107191634.378670-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731007087; x=1731611887; darn=buildroot.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zM9t/VnpApDt+lLSlsR/BBGi5z11GfUyukR0JXhsNso=; b=dBbQeCryBMVEUqn1MHAbmIF576ucah6fTK1PfFr4yB+2YebLk/kLIJomCcb2qfgqf2 E5jmoWojtgjCiJvLvbann0/3gUYW0U/KePiaBCyv2RCsLm3WkjKSMdAPja9k5LXr1MQ1 1JEyXwHSfryWdm4+j1h3EL3TeI1wqPjo57goI3BMVRhSI+WiM979bIR7oGtoYq2xlELM O/fx3cjoPodzE9Otedyz4g0CTf855igQn8nye18wfX/u6NzcKeoybtee0vZ8IVfHJ+mK yGQxCi2ktenr6M70aTVmZ10qCGSx/ctYPPWLgItbdPIr+FoRBtBL52U4kn988BGLqMsn M8cw== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=dBbQeCry Subject: [Buildroot] [PATCH v5 1/4] package/kismet: bump to version 52bcb902e36b2df1562cfbe644b113362248d029 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Kamel Bouhara , Marcin Niestroj , Julien Olivain , Asaf Kahlon , James Hilliard , Woodrow Douglass , Christian Stewart , Robert Rose , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" We need to use the latest git commit as the last release does not support compiling with the newer protobuf releases. Add optional mosquito support. Add librtlsdr mosquito support. Fix python-setuptools dependency which should be host-python-setuptools. Signed-off-by: James Hilliard --- package/kismet/Config.in | 1 - package/kismet/kismet.hash | 2 +- package/kismet/kismet.mk | 21 +++++++++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/package/kismet/Config.in b/package/kismet/Config.in index 2e1e0cfbd0..aa05e045d5 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -42,7 +42,6 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS select BR2_PACKAGE_PYTHON_NUMPY # runtime for RTLAMR and RTLADSB select BR2_PACKAGE_PYTHON_PROTOBUF # runtime select BR2_PACKAGE_PYTHON_SERIAL # runtime for Freaklabs Zigbee - select BR2_PACKAGE_PYTHON_SETUPTOOLS help Enable Python and Python-related tools (RTL_433, RTLAMR, RTLADSB and Freaklabs Zigbee) diff --git a/package/kismet/kismet.hash b/package/kismet/kismet.hash index 543515858e..2d05a6791b 100644 --- a/package/kismet/kismet.hash +++ b/package/kismet/kismet.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f08548e26ca65fa1e567b1debbea1ca4d0e7206bddb96a4f639c90171873e8f7 kismet-2023-07-R1.tar.xz +sha256 2dccf9b5bbf5f4e6b04a44bf8cfecf80db8dcfa52a8183dd1166396c3ca04660 kismet-52bcb902e36b2df1562cfbe644b113362248d029.tar.gz sha256 93c7f0d7e356b0abfb6f494ff3ea37f96abc84e9a5619b25d4e43f7553a55739 LICENSE diff --git a/package/kismet/kismet.mk b/package/kismet/kismet.mk index c448233d60..f182fbe328 100644 --- a/package/kismet/kismet.mk +++ b/package/kismet/kismet.mk @@ -4,9 +4,8 @@ # ################################################################################ -KISMET_VERSION = 2023-07-R1 -KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz -KISMET_SITE = http://www.kismetwireless.net/code +KISMET_VERSION = 52bcb902e36b2df1562cfbe644b113362248d029 +KISMET_SITE = $(call github,kismetwireless,kismet,$(KISMET_VERSION)) KISMET_DEPENDENCIES = \ host-pkgconf \ libpcap \ @@ -37,6 +36,13 @@ else KISMET_CONF_OPTS += --disable-libcap endif +ifeq ($(BR2_PACKAGE_LIBRTLSDR),y) +KISMET_DEPENDENCIES += librtlsdr +KISMET_CONF_OPTS += --enable-librtlsdr +else +KISMET_CONF_OPTS += --disable-librtlsdr +endif + ifeq ($(BR2_PACKAGE_LIBUSB),y) KISMET_DEPENDENCIES += libusb KISMET_CONF_OPTS += --enable-libusb @@ -58,6 +64,13 @@ else KISMET_CONF_OPTS += --disable-lmsensors endif +ifeq ($(BR2_PACKAGE_MOSQUITTO),y) +KISMET_DEPENDENCIES += mosquitto +KISMET_CONF_OPTS += --enable-mosquitto +else +KISMET_CONF_OPTS += --disable-mosquitto +endif + ifeq ($(BR2_PACKAGE_PCRE2),y) KISMET_DEPENDENCIES += pcre2 KISMET_CONF_OPTS += --enable-pcre --enable-require-pcre2 @@ -69,7 +82,7 @@ KISMET_CONF_OPTS += --disable-pcre endif ifeq ($(BR2_PACKAGE_KISMET_PYTHON_TOOLS),y) -KISMET_DEPENDENCIES += python3 python-setuptools +KISMET_DEPENDENCIES += python3 host-python-setuptools KISMET_CONF_OPTS += \ --enable-python-tools \ --with-python-interpreter=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) From patchwork Thu Nov 7 19:16:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 2008134 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XksL5332lz1xxq for ; Fri, 8 Nov 2024 06:18:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C180341E82; Thu, 7 Nov 2024 19:18:15 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id UI3JM2WjHxQa; Thu, 7 Nov 2024 19:18:14 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C96CB41E83 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id C96CB41E83; Thu, 7 Nov 2024 19:18:13 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists1.osuosl.org (Postfix) with ESMTP id 7B49BC0 for ; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 694AF6110F for ; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gVm_QBBa_CNS for ; Thu, 7 Nov 2024 19:18:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::d2b; helo=mail-io1-xd2b.google.com; envelope-from=james.hilliard1@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org AF83E6113D DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org AF83E6113D Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by smtp3.osuosl.org (Postfix) with ESMTPS id AF83E6113D for ; Thu, 7 Nov 2024 19:18:09 +0000 (UTC) Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-83ac4dacaf9so49077039f.2 for ; Thu, 07 Nov 2024 11:18:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731007088; x=1731611888; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E1ryL/+sJjSZJOPMFY3wJdL3eNnPQEK7bRIIGdqvU3Q=; b=mNhTbbTqXO2V64RduPzZC0yejFDVgBMrOyZFOjy8fEX2fSF7RSijq5FO1phLhayiqU TLc85RgwO9BLODAAya1BhfGT5k2kTeMgwp5eQg8eIQ9kZfY8jr1y/y9POjqXZONlGxiz ixfnA3opXL3PUQg02iqSXbvfhGjFU2QQRdr9DhlV9LK0wDt3/0g1VFG2vKLxMWtY5qCE aUn+gGwwXlIXDKFmrMY6ziUQf1tqCNXXbpWCzNZv1R0xfxtZA/4fTesYRKr02Tuo84pj W+i/N6RLK8RgH1UNz/RDqqMerOeMuWlaw6nAnITHqNbOsikutpzbQaS9SYnyIbKVKn0g j6bQ== X-Gm-Message-State: AOJu0Yzoz8965tLKl/r6sNm4F2h5KR4sJZ8RZ/va6DygcljtZmKniWPQ 8Dj61ekVALJDzLL/5FDPkt/blXXRKEO2+PG1VfdifydIgT9aFlkGBX5FLQ== X-Google-Smtp-Source: AGHT+IEnul958jbbHfkzm4EMmLj6jRziWNTtuKhn3dDdNXEkQS2iWUDOwXSfPKda/qGlpHkYAojKpQ== X-Received: by 2002:a05:6602:3fd0:b0:83a:639b:bc44 with SMTP id ca18e2360f4ac-83e03289e44mr4292639f.3.1731007088458; Thu, 07 Nov 2024 11:18:08 -0800 (PST) Received: from james-x399.localdomain (97-118-149-1.hlrn.qwest.net. [97.118.149.1]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de5f8cdd00sm441546173.108.2024.11.07.11.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 11:18:07 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Thu, 7 Nov 2024 12:16:32 -0700 Message-Id: <20241107191634.378670-2-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107191634.378670-1-james.hilliard1@gmail.com> References: <20241107191634.378670-1-james.hilliard1@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731007088; x=1731611888; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E1ryL/+sJjSZJOPMFY3wJdL3eNnPQEK7bRIIGdqvU3Q=; b=ePOQ4FBC/cT1sB1/N/4rq3NWnRiD+uVQ2LhwT4D8XOcLUxhoviM5BbyZVTj7hg4pr7 aHZnnI/6ZaUSN4QtIHg+MW8NyPooI/xM/LSh9ESCFT/n8S4/BjAMm3kywKlfBoVfxpI+ UB2+dGTgF5+Qu50XDF26+zSCxCI6E51q8FlegGhAC+jdbed+nxdtGAlpRVpJx5aXVSyV ytYKNC/MoC/gl8XoU8HKiSDPI2ctHYU1dsVZvZObEBMrNA6jPI7DfiXhB70uhrO+NH85 Z5CyWWmSexxFs1csZ5ZGyWZLj/OOm8JCMeBjTGASWR9Hyjbt+znA04b8VNpSQWtji2k0 6ETw== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ePOQ4FBC Subject: [Buildroot] [PATCH v5 2/4] package/{python-}protobuf: bump to version 28.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Kamel Bouhara , Marcin Niestroj , Julien Olivain , Asaf Kahlon , James Hilliard , Woodrow Douglass , Christian Stewart , Robert Rose , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Migrate protobuf build from autotools to cmake. Migrate protobuf-python to use pypi sources which are now required for setup.py builds: https://github.com/protocolbuffers/protobuf/tree/v28.1/python#building-from-setuppy The BR2_or1k workaround is removed, as protobuf depends on libabseil-cpp, which isn't available on OpenRISC. The BR2_TOOLCHAIN_HAS_GCC_BUG_85180 workaround is removed, as this workaround is for Microblaze, and protobuf depends on libabseil-cpp, which isn't avialable on Microblaze. Signed-off-by: James Hilliard --- Changes v4 -> v5: - fixup some autotools -> cmake migration issues --- package/criu/Config.in | 2 +- package/kismet/Config.in | 12 ++-- package/mosh/Config.in | 6 +- package/netbird/netbird.hash | 3 + package/netbird/netbird.mk | 25 ++++++++ package/netdata/Config.in | 6 +- package/ola/Config.in | 5 +- package/opencv3/Config.in | 6 +- package/opencv4/Config.in | 9 ++- package/protobuf/Config.in | 8 ++- package/protobuf/protobuf.hash | 2 +- package/protobuf/protobuf.mk | 60 +++++++++++--------- package/python-protobuf/python-protobuf.hash | 6 +- package/python-protobuf/python-protobuf.mk | 5 +- package/usbguard/Config.in | 2 +- 15 files changed, 103 insertions(+), 54 deletions(-) create mode 100644 package/netbird/netbird.hash create mode 100644 package/netbird/netbird.mk diff --git a/package/criu/Config.in b/package/criu/Config.in index fc6897c4d0..a56dbe56ff 100644 --- a/package/criu/Config.in +++ b/package/criu/Config.in @@ -19,7 +19,7 @@ config BR2_PACKAGE_CRIU bool "criu" depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # -march=armv7-a+fp, protobuf depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h depends on !BR2_STATIC_LIBS # protobuf, libbsd diff --git a/package/kismet/Config.in b/package/kismet/Config.in index aa05e045d5..65c17baeaf 100644 --- a/package/kismet/Config.in +++ b/package/kismet/Config.in @@ -35,6 +35,7 @@ config BR2_PACKAGE_KISMET_PYTHON_TOOLS bool "Install python tools" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on BR2_PACKAGE_PYTHON3 depends on !BR2_STATIC_LIBS # protobuf depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy @@ -51,26 +52,29 @@ comment "python tools needs python3" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS -comment "python tools needs a glibc or musl toolchain w/ dynamic library" +comment "python tools needs a glibc or musl toolchain w/ dynamic library, gcc >= 8" depends on BR2_STATIC_LIBS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) + depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_KISMET_SERVER bool "Install server" default y depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on !BR2_STATIC_LIBS # dlfcn.h depends on BR2_USE_WCHAR depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PROTOBUF -comment "server needs a toolchain w/ dynamic library, wchar" +comment "server needs a toolchain w/ dynamic library, wchar, gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR + depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 comment "server needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/mosh/Config.in b/package/mosh/Config.in index 5b90358cac..7ca5259ecb 100644 --- a/package/mosh/Config.in +++ b/package/mosh/Config.in @@ -1,7 +1,7 @@ -comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 4.8" +comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, gcc >= 8" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS config BR2_PACKAGE_MOSH @@ -9,7 +9,7 @@ config BR2_PACKAGE_MOSH depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on !BR2_STATIC_LIBS # protobuf depends on BR2_USE_WCHAR select BR2_PACKAGE_PROTOBUF diff --git a/package/netbird/netbird.hash b/package/netbird/netbird.hash new file mode 100644 index 0000000000..24d9e74c0d --- /dev/null +++ b/package/netbird/netbird.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 c736d7d3796eb7a5446ff0ccc562e4f79d8fa6f33e11047e4af9cb3202a4c7e3 netbird-0.31.0-go2.tar.gz +sha256 c9f34c452ac8f054df592e3eeca0e271b91e8010c0fc6cf8c76aabf547a9388d LICENSE diff --git a/package/netbird/netbird.mk b/package/netbird/netbird.mk new file mode 100644 index 0000000000..228639dba0 --- /dev/null +++ b/package/netbird/netbird.mk @@ -0,0 +1,25 @@ +################################################################################ +# +# netbird +# +################################################################################ + +NETBIRD_VERSION = 0.31.0 +NETBIRD_SITE = $(call github,netbirdio,netbird,v$(NETBIRD_VERSION)) +NETBIRD_LICENSE = BSD-3-Clause +NETBIRD_LICENSE_FILES = LICENSE +NETBIRD_GOMOD = github.com/netbirdio/netbird +NETBIRD_BUILD_TARGETS = client +NETBIRD_LDFLAGS = \ + -X github.com/netbirdio/netbird/version.version=$(NETBIRD_VERSION) + +define NETBIRD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/client $(TARGET_DIR)/usr/bin/netbird +endef + +define NETBIRD_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_TUN) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIREGUARD) +endef + +$(eval $(golang-package)) diff --git a/package/netdata/Config.in b/package/netdata/Config.in index d17b5e89aa..3603eb071c 100644 --- a/package/netdata/Config.in +++ b/package/netdata/Config.in @@ -23,15 +23,15 @@ config BR2_PACKAGE_NETDATA_PROMETHEUS bool "prometheus remote write backend" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP # protobuf, snappy - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_SNAPPY help Enable prometheus remote write backend -comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 4.8" +comment "prometheus remote write backend needs a toolchain w/ C++, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS endif diff --git a/package/ola/Config.in b/package/ola/Config.in index dd0be6f35e..1766f5bd76 100644 --- a/package/ola/Config.in +++ b/package/ola/Config.in @@ -1,7 +1,7 @@ comment "ola needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS menuconfig BR2_PACKAGE_OLA @@ -10,7 +10,7 @@ menuconfig BR2_PACKAGE_OLA depends on !BR2_STATIC_LIBS # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID @@ -35,6 +35,7 @@ config BR2_PACKAGE_OLA_WEB config BR2_PACKAGE_OLA_PYTHON_BINDINGS bool "python bindings" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_PROTOBUF help diff --git a/package/opencv3/Config.in b/package/opencv3/Config.in index 2ce548f095..a672497108 100644 --- a/package/opencv3/Config.in +++ b/package/opencv3/Config.in @@ -290,14 +290,14 @@ config BR2_PACKAGE_OPENCV3_WITH_PNG config BR2_PACKAGE_OPENCV3_WITH_PROTOBUF bool "protobuf support" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF help Use shared protobuf from the target system. -comment "protobuf support needs a toolchain w/ gcc >= 4.8" +comment "protobuf support needs a toolchain w/ gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV3_WITH_TIFF bool "tiff support" diff --git a/package/opencv4/Config.in b/package/opencv4/Config.in index f6976d8fb5..f71ceba2c5 100644 --- a/package/opencv4/Config.in +++ b/package/opencv4/Config.in @@ -35,14 +35,16 @@ config BR2_PACKAGE_OPENCV4_LIB_DNN # dnn needs fenv.h which is not provided by uclibc depends on !BR2_TOOLCHAIN_USES_UCLIBC depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_OPENCV4_WITH_PROTOBUF help Include opencv_dnn (Deep Neural Networks) module into the OpenCV build. -comment "dnn needs a glibc or musl toolchain" +comment "dnn needs a glibc or musl toolchain, gcc >= 8" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_TOOLCHAIN_USES_UCLIBC || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_OPENCV4_LIB_FEATURES2D bool "features2d" @@ -155,6 +157,7 @@ config BR2_PACKAGE_OPENCV4_LIB_OBJDETECT bool "objdetect" depends on !BR2_TOOLCHAIN_USES_UCLIBC # dnn support depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # dnn support + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # dnn support # opencv_core dependency is already enabled select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_DNN @@ -204,6 +207,7 @@ config BR2_PACKAGE_OPENCV4_LIB_SHAPE config BR2_PACKAGE_OPENCV4_LIB_STITCHING bool "stitching" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # objdetect + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # objdetect depends on !BR2_TOOLCHAIN_USES_UCLIBC # objdetect select BR2_PACKAGE_OPENCV4_LIB_CALIB3D select BR2_PACKAGE_OPENCV4_LIB_FEATURES2D @@ -333,6 +337,7 @@ config BR2_PACKAGE_OPENCV4_WITH_PNG config BR2_PACKAGE_OPENCV4_WITH_PROTOBUF bool "protobuf support" depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf select BR2_PACKAGE_PROTOBUF help Use shared protobuf from the target system. diff --git a/package/protobuf/Config.in b/package/protobuf/Config.in index 47e987fa2b..633201b38c 100644 --- a/package/protobuf/Config.in +++ b/package/protobuf/Config.in @@ -37,6 +37,7 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS default y if BR2_sparc64 default y if BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS + depends on BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS depends on BR2_USE_MMU # fork() config BR2_PACKAGE_PROTOBUF @@ -44,8 +45,9 @@ config BR2_PACKAGE_PROTOBUF depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libabseil-cpp depends on !BR2_STATIC_LIBS + select BR2_PACKAGE_LIBABSEIL_CPP help Protocol buffers are Google's language-neutral, platform-neutral, extensible mechanism for serializing @@ -53,7 +55,7 @@ config BR2_PACKAGE_PROTOBUF https://developers.google.com/protocol-buffers -comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" +comment "protobuf needs a toolchain w/ C++, threads, dynamic library, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package/protobuf/protobuf.hash b/package/protobuf/protobuf.hash index b092c9303f..06f4924394 100644 --- a/package/protobuf/protobuf.hash +++ b/package/protobuf/protobuf.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE -sha256 4eab9b524aa5913c6fffb20b2a8abf5ef7f95a80bc0701f3a6dbb4c607f73460 protobuf-cpp-3.21.12.tar.gz +sha256 3b8bf6e96499a744bd014c60b58f797715a758093abf859f1d902194b8e1f8c9 protobuf-28.1.tar.gz diff --git a/package/protobuf/protobuf.mk b/package/protobuf/protobuf.mk index 8cd4e99e06..ffed3166c7 100644 --- a/package/protobuf/protobuf.mk +++ b/package/protobuf/protobuf.mk @@ -7,45 +7,53 @@ # When bumping this package, make sure to also verify if the # python-protobuf package still works and to update its hash, # as they share the same version/site variables. -PROTOBUF_VERSION = 21.12 -PROTOBUF_SOURCE = protobuf-cpp-3.$(PROTOBUF_VERSION).tar.gz +PROTOBUF_VERSION = 28.1 PROTOBUF_SITE = https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOBUF_VERSION) PROTOBUF_LICENSE = BSD-3-Clause PROTOBUF_LICENSE_FILES = LICENSE PROTOBUF_CPE_ID_VENDOR = google # N.B. Need to use host protoc during cross compilation. -PROTOBUF_DEPENDENCIES = host-protobuf -PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/bin/protoc - -PROTOBUF_CXXFLAGS = $(TARGET_CXXFLAGS) - -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -PROTOBUF_CXXFLAGS += -O0 -endif - -ifeq ($(BR2_or1k),y) -PROTOBUF_CXXFLAGS += -mcmodel=large -endif - -PROTOBUF_CONF_ENV = CXXFLAGS="$(PROTOBUF_CXXFLAGS)" +PROTOBUF_DEPENDENCIES = host-protobuf libabseil-cpp +PROTOBUF_CONF_OPTS = \ + -Dprotobuf_ABSL_PROVIDER=package \ + -Dprotobuf_ALLOW_CCACHE=ON \ + -Dprotobuf_BUILD_CONFORMANCE=OFF \ + -Dprotobuf_BUILD_LIBPROTOC=OFF \ + -Dprotobuf_BUILD_LIBUPB=ON \ + -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \ + -Dprotobuf_BUILD_PROTOC_BINARIES=OFF \ + -Dprotobuf_BUILD_TESTS=OFF \ + -Dprotobuf_DISABLE_RTTI=OFF \ + -Dprotobuf_INSTALL=ON \ + -DWITH_PROTOC=$(HOST_DIR)/bin/protoc + +HOST_PROTOBUF_DEPENDENCIES = host-libabseil-cpp +HOST_PROTOBUF_CONF_OPTS = \ + -Dprotobuf_ABSL_PROVIDER=package \ + -Dprotobuf_ALLOW_CCACHE=ON \ + -Dprotobuf_BUILD_CONFORMANCE=OFF \ + -Dprotobuf_BUILD_LIBPROTOC=ON \ + -Dprotobuf_BUILD_LIBUPB=OFF \ + -Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \ + -Dprotobuf_BUILD_PROTOC_BINARIES=ON \ + -Dprotobuf_BUILD_TESTS=OFF \ + -Dprotobuf_DISABLE_RTTI=OFF \ + -Dprotobuf_INSTALL=ON \ + -Dprotobuf_WITH_ZLIB=OFF ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -PROTOBUF_CONF_ENV += LIBS=-latomic +PROTOBUF_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic endif PROTOBUF_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_ZLIB),y) PROTOBUF_DEPENDENCIES += zlib +PROTOBUF_CONF_OPTS += -Dprotobuf_WITH_ZLIB=ON +else +PROTOBUF_CONF_OPTS += -Dprotobuf_WITH_ZLIB=OFF endif -define PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES - rm -rf $(TARGET_DIR)/usr/bin/protoc - rm -rf $(TARGET_DIR)/usr/lib/libprotoc.so* -endef - -PROTOBUF_POST_INSTALL_TARGET_HOOKS += PROTOBUF_REMOVE_UNNECESSARY_TARGET_FILES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) diff --git a/package/python-protobuf/python-protobuf.hash b/package/python-protobuf/python-protobuf.hash index e7af678b97..8ce6039449 100644 --- a/package/python-protobuf/python-protobuf.hash +++ b/package/python-protobuf/python-protobuf.hash @@ -1,3 +1,5 @@ -# Locally calculated -sha256 e2b976e67d6fcf7078f799143a73f2a4d9cf3126ca68a1a6f1bda30fe5f3585c protobuf-python-4.21.12.tar.gz +# md5, sha256 from https://pypi.org/pypi/protobuf/json +md5 44b076f3564d3561067bcc2c455e008a protobuf-5.28.1.tar.gz +sha256 42597e938f83bb7f3e4b35f03aa45208d49ae8d5bcb4bc10b9fc825e0ab5e423 protobuf-5.28.1.tar.gz +# Locally computed sha256 checksums sha256 6e5e117324afd944dcf67f36cf329843bc1a92229a8cd9bb573d7a83130fea7d LICENSE diff --git a/package/python-protobuf/python-protobuf.mk b/package/python-protobuf/python-protobuf.mk index df90254670..02bf2a1d70 100644 --- a/package/python-protobuf/python-protobuf.mk +++ b/package/python-protobuf/python-protobuf.mk @@ -5,12 +5,11 @@ ################################################################################ PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = protobuf-python-4.$(PYTHON_PROTOBUF_VERSION).tar.gz -PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) +PYTHON_PROTOBUF_SOURCE = protobuf-5.$(PYTHON_PROTOBUF_VERSION).tar.gz +PYTHON_PROTOBUF_SITE = https://files.pythonhosted.org/packages/3c/0b/7a997c8939f698d72bdea14d57116e43d3051fffb3b2964c30938c4a08e6 PYTHON_PROTOBUF_LICENSE = BSD-3-Clause PYTHON_PROTOBUF_LICENSE_FILES = LICENSE PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf PYTHON_PROTOBUF_SETUP_TYPE = setuptools -PYTHON_PROTOBUF_SUBDIR = python $(eval $(python-package)) diff --git a/package/usbguard/Config.in b/package/usbguard/Config.in index f207fa6826..254209ff64 100644 --- a/package/usbguard/Config.in +++ b/package/usbguard/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_USBGUARD depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS # protobuf depends on BR2_INSTALL_LIBSTDCPP # protobuf depends on BR2_TOOLCHAIN_HAS_THREADS # libqb, protobuf - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # protobuf, C++17 filesystem depends on !BR2_STATIC_LIBS # libqb, protobuf depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_PROTOBUF From patchwork Thu Nov 7 19:16:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 2008137 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XksL83wkhz1xxq for ; Fri, 8 Nov 2024 06:18:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5D85384456; Thu, 7 Nov 2024 19:18:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tZ13eaJmdLhh; Thu, 7 Nov 2024 19:18:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A267584457 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp1.osuosl.org (Postfix) with ESMTP id A267584457; Thu, 7 Nov 2024 19:18:18 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists1.osuosl.org (Postfix) with ESMTP id 29AB5C1 for ; Thu, 7 Nov 2024 19:18:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0A9F441E82 for ; Thu, 7 Nov 2024 19:18:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JUmLaPdGcBUe for ; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::d31; helo=mail-io1-xd31.google.com; envelope-from=james.hilliard1@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CAEF441D84 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CAEF441D84 Received: from mail-io1-xd31.google.com (mail-io1-xd31.google.com [IPv6:2607:f8b0:4864:20::d31]) by smtp4.osuosl.org (Postfix) with ESMTPS id CAEF441D84 for ; Thu, 7 Nov 2024 19:18:10 +0000 (UTC) Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-83ab21c26f1so47518839f.2 for ; Thu, 07 Nov 2024 11:18:10 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731007089; x=1731611889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nx6au2Z5MH79fAgczMDg5JLWLVUGRG8ho5F2LNUcSc8=; b=qG7f27xo6jAAU2Y1JjA6h8uZCK+xzCzrUMXTXBRgoPTqBm8ZxKdBEQsPODdtS1oCDe CcAjHNRCNknjZSWlOKBXTv9wkfVZMg7cqo51MWdHIj320UtxruQ1wgEAkQeH2imNfqOP BA0g5uNnx6pcgXZ0FufOn33k9NGLJHL+IvKWXZgqIUBm6TChs6+k0xODHtlyr7J+kz3F TLdKuvQKyq9tbWt4YHbWTUOL0LZk0qSM8HhnpaMwSEVcF/XfuwYTf7I/dRyoCFw7Iymv PTkEbmW5vYaN5zXPcknJsG4hDrtt/l3HG/jyNl+X06PpwNclxpCL2Y42GVLIx98mRQe6 50bA== X-Gm-Message-State: AOJu0YxCaptL6LoYKTKRyNQfMMosnl5FjNZtaZShWmxXxZjVXlCmBmM6 DlxLZUVoZFvpCaOnTsixiwEv4W7bXz47T/oW3ayRuRfSswHaxNWLk7dwHA== X-Google-Smtp-Source: AGHT+IGpUBc20i114n3kHwASdRHG3B7z7Ph2MSDahni/wO6qDiPd9J7Sx3ax+OfoyNC7z31FBDPbLw== X-Received: by 2002:a05:6602:6013:b0:83a:b33a:2f2e with SMTP id ca18e2360f4ac-83dff81b4afmr55293639f.14.1731007089369; Thu, 07 Nov 2024 11:18:09 -0800 (PST) Received: from james-x399.localdomain (97-118-149-1.hlrn.qwest.net. [97.118.149.1]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de5f8cdd00sm441546173.108.2024.11.07.11.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 11:18:08 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Thu, 7 Nov 2024 12:16:33 -0700 Message-Id: <20241107191634.378670-3-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107191634.378670-1-james.hilliard1@gmail.com> References: <20241107191634.378670-1-james.hilliard1@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731007089; x=1731611889; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nx6au2Z5MH79fAgczMDg5JLWLVUGRG8ho5F2LNUcSc8=; b=PZK8EFok8lsus8Lq2lBuG4UypzwFqQCVFKWUUTUNQ1KYV0amUbb/rv4DRPsj15fp/d 3LHfGFUrWX+sMp4xUcRmB+wUmfsPhb0NUEIo8mHJihOB4zvXif2qCMaKMa1AfyktSM+1 SwHs4GYMNVQ9tlnnHATthN3JcQuG/BHVn+2pln3vmilmxQRnprSd5oO4kER+IiTt7HGN ld05oNla65W9ywec+ZS5mrxetrFz804W/b6CH1ZqecEhfJxLl00V4kZpMkN9G4ExHBSx 57Ov6f5HfL9LcPhhKySyUv9n3RoKy6s7EeIUAnYYmL2SaFgIcXBsVdPd+shxQGfZon76 hhRw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PZK8EFok Subject: [Buildroot] [PATCH v5 3/4] package/grpc: bump to version 1.66.1 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Kamel Bouhara , Marcin Niestroj , Julien Olivain , Asaf Kahlon , James Hilliard , Woodrow Douglass , Christian Stewart , Robert Rose , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add new -DgRPC_BUILD_CODEGEN=OFF config option which is required if no plugins are enabled. Drop no longer relevant add GPR_DISABLE_WRAPPED_MEMCPY patch. Rebase remaining patches. Signed-off-by: James Hilliard --- .checkpackageignore | 3 +- ...the-availability-of-pthread_setname_.patch | 26 ++--- ...trict-building-of-host-grpc-to-grpc.patch} | 98 ++++++++----------- ...py.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch | 34 ------- ...conditionally-downloading-api-repos.patch} | 21 ++-- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 3 +- 7 files changed, 68 insertions(+), 119 deletions(-) rename package/grpc/{0003-host-grpc-only-cpp-plugin.patch => 0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch} (63%) delete mode 100644 package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch rename package/grpc/{0004-disable-unconditionally-downloading-api-repos.patch => 0003-disable-unconditionally-downloading-api-repos.patch} (62%) diff --git a/.checkpackageignore b/.checkpackageignore index ee075f4cb2..6e8d5228ab 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -557,8 +557,7 @@ package/gobject-introspection/0002-Add-rpath-links-to-ccompiler.patch lib_patch. package/gpsd/S50gpsd Shellcheck lib_sysv.Indent lib_sysv.Variables package/gptfdisk/0001-gptcurses-partially-revert-Tweaks-for-building-on-th.patch lib_patch.Upstream package/graphite2/0001-don-t-install-a-libtool-file-with-static-library.patch lib_patch.Upstream -package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch lib_patch.Upstream -package/grpc/0004-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream +package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch.Upstream package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstream diff --git a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch index 92dc5a6c45..e8e211758a 100644 --- a/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0001-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 +From dfec50b899c449bc964514f16e94869de7a68896 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -20,15 +20,15 @@ Signed-off-by: Thomas Petazzoni ] Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 6 ++++++ - include/grpc/impl/codegen/port_platform.h | 2 ++ + CMakeLists.txt | 6 ++++++ + include/grpc/support/port_platform.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c2fcb..0b2be4f 100644 +index 053b9e3784..2565dc5c84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -208,6 +208,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) +@@ -291,6 +291,12 @@ if (NOT DEFINED CMAKE_POSITION_INDEPENDENT_CODE) endif() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") @@ -41,11 +41,11 @@ index 45c2fcb..0b2be4f 100644 if(MSVC) include(cmake/msvc_static_runtime.cmake) add_definitions(-D_WIN32_WINNT=0x600 -D_SCL_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS) -diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index 4f213ff..55ecd9d 100644 ---- a/include/grpc/impl/codegen/port_platform.h -+++ b/include/grpc/impl/codegen/port_platform.h -@@ -186,6 +186,7 @@ +diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h +index 5fb7426af2..24d438d702 100644 +--- a/include/grpc/support/port_platform.h ++++ b/include/grpc/support/port_platform.h +@@ -228,6 +228,7 @@ #endif /* _LP64 */ #ifdef __GLIBC__ #define GPR_POSIX_CRASH_HANDLER 1 @@ -53,7 +53,7 @@ index 4f213ff..55ecd9d 100644 #ifdef __GLIBC_PREREQ #if __GLIBC_PREREQ(2, 12) #define GPR_LINUX_PTHREAD_NAME 1 -@@ -194,6 +195,7 @@ +@@ -236,6 +237,7 @@ // musl libc & others #define GPR_LINUX_PTHREAD_NAME 1 #endif @@ -61,6 +61,6 @@ index 4f213ff..55ecd9d 100644 #include #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 - -- -2.26.63 +2.34.1 + diff --git a/package/grpc/0003-host-grpc-only-cpp-plugin.patch b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch similarity index 63% rename from package/grpc/0003-host-grpc-only-cpp-plugin.patch rename to package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch index bfb8713053..82705d8a1e 100644 --- a/package/grpc/0003-host-grpc-only-cpp-plugin.patch +++ b/package/grpc/0002-Add-option-to-restrict-building-of-host-grpc-to-grpc.patch @@ -1,4 +1,4 @@ -From 0f2c73b62bdc612f9d5cdd8e0c765995470d4f8b Mon Sep 17 00:00:00 2001 +From 6aab068a6bd92e215b61eaab61062bf1d97bc065 Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Tue, 25 May 2021 14:55:23 +0200 Subject: [PATCH] Add option to restrict building of (host-)grpc to @@ -15,17 +15,17 @@ Signed-off-by: Fabrice Fontaine Updated for 1.48.0: Signed-off-by: Michael Nosthoff --- - CMakeLists.txt | 39 +++++++++++++++++++++++++++++++++++---- - 1 file changed, 35 insertions(+), 4 deletions(-) + CMakeLists.txt | 36 +++++++++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0dcae6b1aee5..57b3963a43b0 100644 +index 2565dc5c84..94f8fd3e93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -49,12 +49,16 @@ option(gRPC_BUILD_TESTS "Build tests" OFF) +@@ -50,12 +50,16 @@ set(gRPC_BUILD_MSVC_MP_COUNT 0 CACHE STRING "The maximum number of processes for + option(gRPC_BUILD_TESTS "Build tests" OFF) option(gRPC_BUILD_CODEGEN "Build codegen" ON) - option(gRPC_BUILD_CSHARP_EXT "Build C# extensions" ON) - option(gRPC_BACKWARDS_COMPATIBILITY_MODE "Build libraries that are binary compatible across a larger number of OS and libc versions" OFF) + option(gRPC_DOWNLOAD_ARCHIVES "Download archives for empty 3rd party directories" ON) +option(gRPC_BUILD_PLUGIN_SUPPORT_ONLY "Build plugin support only" OFF) set(gRPC_INSTALL_default ON) @@ -39,7 +39,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 set(gRPC_INSTALL ${gRPC_INSTALL_default} CACHE BOOL "Generate installation target") -@@ -563,6 +567,8 @@ add_custom_target(plugins +@@ -662,6 +666,8 @@ add_custom_target(plugins DEPENDS ${_gRPC_PLUGIN_LIST} ) @@ -48,7 +48,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_custom_target(tools_c DEPENDS ) -@@ -574,6 +580,8 @@ add_custom_target(tools_cxx +@@ -673,6 +679,8 @@ add_custom_target(tools_cxx add_custom_target(tools DEPENDS tools_c tools_cxx) @@ -57,15 +57,16 @@ index 0dcae6b1aee5..57b3963a43b0 100644 protobuf_generate_grpc_cpp_with_import_path_correction( src/proto/grpc/channelz/channelz.proto src/proto/grpc/channelz/channelz.proto ) -@@ -1307,6 +1315,7 @@ if(gRPC_BUILD_TESTS) +@@ -1660,7 +1668,7 @@ if(gRPC_BUILD_TESTS) DEPENDS buildtests_c buildtests_cxx) endif() +- +if (NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) add_library(address_sorting third_party/address_sorting/address_sorting.c -@@ -1359,6 +1368,8 @@ if(gRPC_INSTALL) +@@ -2855,6 +2863,8 @@ if(gRPC_INSTALL) ) endif() @@ -73,17 +74,17 @@ index 0dcae6b1aee5..57b3963a43b0 100644 + if(gRPC_BUILD_TESTS) - add_library(end2end_tests -@@ -1512,6 +1523,8 @@ target_link_libraries(end2end_tests + add_library(grpc_test_util +@@ -2987,6 +2997,8 @@ endif() endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + - add_library(gpr - src/core/lib/gpr/alloc.cc - src/core/lib/gpr/atm.cc -@@ -2504,6 +2517,8 @@ if(gRPC_INSTALL) + add_library(grpc_unsecure + src/core/channelz/channel_trace.cc + src/core/channelz/channelz.cc +@@ -3547,6 +3559,8 @@ if(gRPC_INSTALL) ) endif() @@ -91,17 +92,17 @@ index 0dcae6b1aee5..57b3963a43b0 100644 + if(gRPC_BUILD_TESTS) - add_library(grpc_test_util -@@ -2618,6 +2633,8 @@ endif() + add_library(gtest +@@ -3621,6 +3635,8 @@ target_link_libraries(gtest endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + - add_library(grpc_unsecure - src/core/ext/filters/census/grpc_context.cc - src/core/ext/filters/channel_idle/channel_idle_filter.cc -@@ -3102,6 +3119,8 @@ if(gRPC_INSTALL) + add_library(upb_base_lib + third_party/upb/upb/base/status.c + ) +@@ -4108,6 +4124,8 @@ if(gRPC_INSTALL) ) endif() @@ -110,7 +111,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 if(gRPC_BUILD_TESTS) if(gRPC_BUILD_CODEGEN) -@@ -3185,6 +3204,8 @@ endif() +@@ -4193,6 +4211,8 @@ endif() endif() @@ -119,24 +120,24 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_library(grpc++ src/core/ext/transport/binder/client/binder_connector.cc src/core/ext/transport/binder/client/channel_create.cc -@@ -3635,6 +3656,7 @@ if(gRPC_INSTALL) +@@ -4684,6 +4704,7 @@ if(gRPC_INSTALL) ) endif() +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY if(gRPC_BUILD_CODEGEN) - add_library(grpc++_reflection -@@ -3889,6 +3911,8 @@ target_link_libraries(grpc++_test_util + add_library(grpc++_reflection ${_gRPC_STATIC_WIN32} +@@ -4967,6 +4988,8 @@ target_link_libraries(grpc++_test_util endif() +if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) + add_library(grpc++_unsecure + src/cpp/client/call_credentials.cc src/cpp/client/channel_cc.cc - src/cpp/client/client_callback.cc -@@ -4181,6 +4205,7 @@ if(gRPC_INSTALL) +@@ -5707,6 +5730,7 @@ if(gRPC_INSTALL) ) endif() @@ -144,7 +145,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_library(grpc_plugin_support src/compiler/cpp_generator.cc -@@ -4240,7 +4265,7 @@ foreach(_hdr +@@ -5769,7 +5793,7 @@ foreach(_hdr endforeach() @@ -153,25 +154,7 @@ index 0dcae6b1aee5..57b3963a43b0 100644 install(TARGETS grpc_plugin_support EXPORT gRPCTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -4324,6 +4349,8 @@ endif() - - endif() - -+if(NOT gRPC_BUILD_PLUGIN_SUPPORT_ONLY) -+ - add_library(upb - third_party/upb/third_party/utf8_range/naive.c - third_party/upb/third_party/utf8_range/range2-neon.c -@@ -4393,6 +4420,8 @@ if(gRPC_INSTALL) - ) - endif() - -+endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY -+ - - if(gRPC_BUILD_TESTS) - -@@ -11085,7 +11114,7 @@ target_link_libraries(grpc_completion_queue_test +@@ -16520,7 +16544,7 @@ target_link_libraries(grpc_completion_queue_test endif() @@ -180,16 +163,16 @@ index 0dcae6b1aee5..57b3963a43b0 100644 add_executable(grpc_cpp_plugin src/compiler/cpp_plugin.cc -@@ -11115,7 +11144,7 @@ target_link_libraries(grpc_cpp_plugin +@@ -16548,7 +16572,7 @@ target_link_libraries(grpc_cpp_plugin -if(gRPC_INSTALL) +if(gRPC_INSTALL OR gRPC_BUILD_PLUGIN_SUPPORT_ONLY) - install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets + install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR} BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR} -@@ -23128,7 +23157,7 @@ endif() +@@ -37968,7 +37992,7 @@ endif() @@ -198,12 +181,13 @@ index 0dcae6b1aee5..57b3963a43b0 100644 if(gRPC_INSTALL) install(EXPORT gRPCTargets -@@ -23225,3 +23254,5 @@ generate_pkgconfig( - "-lgrpc++_unsecure" - "" - "grpc++_unsecure.pc") +@@ -38089,3 +38113,5 @@ generate_pkgconfig( + "-lgrpcpp_otel_plugin" + "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_wire_lib -lupb_message_lib -lutf8_range_lib -lupb_mini_descriptor_lib -lupb_mem_lib -lupb_base_lib" + "grpcpp_otel_plugin.pc") + +endif() # gRPC_BUILD_PLUGIN_SUPPORT_ONLY +\ No newline at end of file -- -2.43.0 +2.34.1 diff --git a/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch b/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch deleted file mode 100644 index aac92bab13..0000000000 --- a/package/grpc/0002-wrap_memcpy.cc-add-GPR_DISABLE_WRAPPED_MEMCPY.patch +++ /dev/null @@ -1,34 +0,0 @@ -From be030314805137cd63b46ea6eaa702b608669910 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 2 Jun 2019 17:45:47 +0200 -Subject: [PATCH] wrap_memcpy.cc: add GPR_DISABLE_WRAPPED_MEMCPY - -Add GPR_DISABLE_WRAPPED_MEMCPY to allow the user to disable wrapped -memcpy. This will fix build on x86_64 on musl/uclibc without changing -the cpu behavior. - -Fixes: - - http://autobuild.buildroot.org/results/20d6f2489a4e291a53bd514da66105eb607e1014 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/grpc/grpc/pull/19207] ---- - src/core/lib/gpr/wrap_memcpy.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/lib/gpr/wrap_memcpy.cc b/src/core/lib/gpr/wrap_memcpy.cc -index 9b8608e056..38b76acf95 100644 ---- a/src/core/lib/gpr/wrap_memcpy.cc -+++ b/src/core/lib/gpr/wrap_memcpy.cc -@@ -29,7 +29,7 @@ - extern "C" { - #ifdef __linux__ - #if defined(__x86_64__) && !defined(GPR_MUSL_LIBC_COMPAT) && \ -- !defined(__ANDROID__) -+ !defined(__ANDROID__) && !defined(GPR_DISABLE_WRAPPED_MEMCPY) - __asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); - void* __wrap_memcpy(void* destination, const void* source, size_t num) { - return memcpy(destination, source, num); --- -2.20.1 - diff --git a/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch similarity index 62% rename from package/grpc/0004-disable-unconditionally-downloading-api-repos.patch rename to package/grpc/0003-disable-unconditionally-downloading-api-repos.patch index 967bbf6247..0cd5012b26 100644 --- a/package/grpc/0004-disable-unconditionally-downloading-api-repos.patch +++ b/package/grpc/0003-disable-unconditionally-downloading-api-repos.patch @@ -1,4 +1,4 @@ -From b0599c3d1b52818c79ea8fa5dfdc40a4ce01e454 Mon Sep 17 00:00:00 2001 +From 2a73f6439b6d745b2cbfff120dc7adc555400247 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 22 Jul 2022 08:49:48 +0200 Subject: [PATCH] disable unconditionally downloading api repos @@ -9,31 +9,30 @@ for now. See https://github.com/grpc/grpc/issues/30385 Signed-off-by: Michael Nosthoff - --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 11e7ae2b67..a9062fa6ef 100644 +index 94f8fd3e93..df43d2e193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -327,6 +327,7 @@ include(cmake/xxhash.cmake) - include(cmake/zlib.cmake) - include(cmake/download_archive.cmake) +@@ -402,6 +402,7 @@ if(gRPC_BUILD_GRPCPP_OTEL_PLUGIN) + include(cmake/opentelemetry-cpp.cmake) + endif() +if(FALSE) # Setup external proto library at third_party/envoy-api with 2 download URLs - if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api) + if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/envoy-api AND gRPC_DOWNLOAD_ARCHIVES) # Download the archive via HTTP, validate the checksum, and extract to third_party/envoy-api. -@@ -403,6 +404,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds) - xds-cb28da3451f158a947dfc45090fe92b07b243bc1 +@@ -478,6 +479,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/xds AND gRPC_DOWNLOAD_ARC + xds-3a472e524827f72d1ad621c4983dd5af54c46776 ) endif() +endif() if(WIN32) - set(_gRPC_BASELIB_LIBRARIES ws2_32 crypt32) + set(_gRPC_ALLTARGETS_LIBRARIES ${_gRPC_ALLTARGETS_LIBRARIES} ws2_32 crypt32) -- -2.25.1 +2.34.1 diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index e6b76dcb5e..08aada1454 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b55696fb249669744de3e71acc54a9382bea0dce7cd5ba379b356b12b82d4229 grpc-1.51.1.tar.gz +sha256 79ed4ab72fa9589b20f8b0b76c16e353e4cfec1d773d33afad605d97b5682c61 grpc-1.66.1.tar.gz sha256 590198e3f305f2c347fde64d637c65492bbef554db6c8364e149cd375e3797ee LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 9125b1f9f6..47ebf1997c 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = 1.51.1 +GRPC_VERSION = 1.66.1 GRPC_SITE = $(call github,grpc,grpc,v$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0, BSD-3-Clause (third_party code), MPL-2.0 (etc/roots.pem) GRPC_LICENSE_FILES = LICENSE @@ -29,6 +29,7 @@ GRPC_CONF_OPTS = \ -DgRPC_RE2_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package \ + -DgRPC_BUILD_CODEGEN=OFF \ -DgRPC_BUILD_GRPC_CPP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF \ -DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF \ From patchwork Thu Nov 7 19:16:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 2008135 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XksL53Wkkz1xyb for ; Fri, 8 Nov 2024 06:18:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 51424600B9; Thu, 7 Nov 2024 19:18:17 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hVjayyTM4-zU; Thu, 7 Nov 2024 19:18:16 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4D06D61160 Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp3.osuosl.org (Postfix) with ESMTP id 4D06D61160; Thu, 7 Nov 2024 19:18:16 +0000 (UTC) X-Original-To: buildroot@buildroot.org Delivered-To: buildroot@buildroot.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists1.osuosl.org (Postfix) with ESMTP id 4BEC1C1 for ; Thu, 7 Nov 2024 19:18:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4306784438 for ; Thu, 7 Nov 2024 19:18:12 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id biK6B8X0sWSi for ; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::d30; helo=mail-io1-xd30.google.com; envelope-from=james.hilliard1@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 5BD0D84380 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5BD0D84380 Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5BD0D84380 for ; Thu, 7 Nov 2024 19:18:11 +0000 (UTC) Received: by mail-io1-xd30.google.com with SMTP id ca18e2360f4ac-83abcfb9f37so53764239f.1 for ; Thu, 07 Nov 2024 11:18:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731007090; x=1731611890; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TPNVsYLyvWsnyP8WQRbjP3pcB9qjXuKd213lkN5QZ9A=; b=FWQ7WxmiLvULgolLAu6NZ/+LdDUrQKN9IK468ocFbpn7DHLjf3JyuP3Qw7zcuaPAes 1HbvqN5qb5C8HuB1UMWoalN8mStJuQMkOzP5UF2K6va+us/Wns4KAhXeEaOoyRc8+mCL bu2S7o+K2dkIYcrluHvHXqALAJElo8a0dNcN5VXZRYVwkEZdCK4V02xMmYrfU34tXRIh IusiqwC/OkxcWJHQ2j6NFvYXiPKp/SgOODSbpJH+FkBQowwtxqNn2aveZ9mqgOFZa01O eomU+6nN7nNAcVGy2CNlWXTJuuijfOfVK8wbNkS3uYfrS3hJxRfJ086FNP2Yqss8Dt/q 3lHw== X-Gm-Message-State: AOJu0Yy/9y6rdz/fq3n/JXOUG/XUyL3CfO0d8AzkoWnWHhuEWvMTJkFU CQ0RIdkZ84YA8yBsuMoLSe2fLlUBWPcngcIzVHaMgqnX5A/mjzaDk0ImcA== X-Google-Smtp-Source: AGHT+IE3XeYrAthm+1gJXnQumhhBG0CptHWilYUQJWS+dG/fjKerStfcUeopTgpG2PyRlnfsRx043g== X-Received: by 2002:a05:6602:6d86:b0:83a:b235:2d74 with SMTP id ca18e2360f4ac-83e032e0387mr1997739f.7.1731007090059; Thu, 07 Nov 2024 11:18:10 -0800 (PST) Received: from james-x399.localdomain (97-118-149-1.hlrn.qwest.net. [97.118.149.1]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4de5f8cdd00sm441546173.108.2024.11.07.11.18.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2024 11:18:09 -0800 (PST) From: James Hilliard To: buildroot@buildroot.org Date: Thu, 7 Nov 2024 12:16:34 -0700 Message-Id: <20241107191634.378670-4-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241107191634.378670-1-james.hilliard1@gmail.com> References: <20241107191634.378670-1-james.hilliard1@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731007090; x=1731611890; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TPNVsYLyvWsnyP8WQRbjP3pcB9qjXuKd213lkN5QZ9A=; b=CGawTU8nX4FKLEgjEMf6gwUInhYRFu0Z9QFhsz+RYanzF+X+762H4eiH06uLkvB4Fu MEcTxaE/zJRwGze7NYXroORzW/uIyBDu9c0HPj0LWCi4WY1RJoNWZtkPegrXN+YcUPnU fWg0vwZO04AcLKQBUTegf6sJzDcy+bCNOYu1lmYeaCFG+vTmEW0BeeS/9o2msH3yVmcS oG9jPpj0PNnIbofEjA2Enz+XLLxMf559YHwNE5q9+qN+kt4P5cy0jAeqB4O143es/nar 5Z1C9yqxMuPtnr002WyFrM4A/nHg74ntuea3e8zvRAFdA5PDrjlzOstV4hxS6E75mY7i OTZA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CGawTU8n Subject: [Buildroot] [PATCH v5 4/4] package/grpc: remove BR2_TOOLCHAIN_HAS_GCC_BUG_85180 dead code X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson , Kamel Bouhara , Thomas Petazzoni , Marcin Niestroj , Julien Olivain , Asaf Kahlon , James Hilliard , Woodrow Douglass , Christian Stewart , Robert Rose , Fabrice Fontaine Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Thomas Petazzoni This work-around was added in commit 716f8b34c526c702aa19e9a66a25df5d3a6ea663 ("package/grpc: work around gcc bug 85180") to work around a bug on Microblaze. However, since commit ae0557403a3a4cbf5354f0ab1784a08623382e5e ("package/libabseil-cpp: add BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS"), grpc depends on libaseil-cpp, which isn't available on Microblaze, making the GCC_BUG_85180 no longer needed, and effectively dead code. This commit drops it. Signed-off-by: Thomas Petazzoni --- package/grpc/grpc.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 47ebf1997c..39be4f583f 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -59,11 +59,6 @@ GRPC_CFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY GRPC_CXXFLAGS += -DGPR_DISABLE_WRAPPED_MEMCPY endif -ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y) -GRPC_CFLAGS += -O0 -GRPC_CXXFLAGS += -O0 -endif - GRPC_CONF_OPTS += \ -DCMAKE_C_FLAGS="$(GRPC_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(GRPC_CXXFLAGS)"