mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-23 15:54:21 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/protobuf-c: bump to version 1.5.0

Browse Source 
- drops support for proto2
- fixes compatibility with protobuf >= 22.0 (which we did not yet bump)
- to be compatible with new protobuf versions c++17 is now required
  when building with protoc (which we only do for the host package) [0]
  hence require host gcc >= 7 for c++17 support, propagate to
  depending packages
- the license file has changed with a change of the copyright years,
  nothing else

[0] https://github.com/protobuf-c/protobuf-c/pull/673

Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Michael Nosthoff
2024-01-19 08:29:27 +01:00
committed by Thomas Petazzoni
parent f6c33f3e89
commit e97fc89e7b
7 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/collectd/Config.in
View File

@@ -738,12 +738,17 @@ config BR2_PACKAGE_COLLECTD_RIEMANN
# riemann-c-client -> protobuf-c # riemann-c-client -> protobuf-c
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c
select BR2_PACKAGE_RIEMANN_C_CLIENT select BR2_PACKAGE_RIEMANN_C_CLIENT
select BR2_PACKAGE_LIBTOOL select BR2_PACKAGE_LIBTOOL
help help
Sends data to Riemann, a stream processing and monitoring Sends data to Riemann, a stream processing and monitoring
system. system.
comment "riemann needs a toolchain w/ C++, host gcc >= 7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
config BR2_PACKAGE_COLLECTD_UNIXSOCK config BR2_PACKAGE_COLLECTD_UNIXSOCK
bool "unixsock" bool "unixsock"
help help
@@ -772,14 +777,15 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
bool "write_prometheus" bool "write_prometheus"
depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c
depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c
select BR2_PACKAGE_LIBMICROHTTPD select BR2_PACKAGE_LIBMICROHTTPD
select BR2_PACKAGE_PROTOBUF_C select BR2_PACKAGE_PROTOBUF_C
help help
Publishes values using an embedded HTTP server, in a format Publishes values using an embedded HTTP server, in a format
compatible with Prometheus' collectd_exporter. compatible with Prometheus' collectd_exporter.
comment "write_prometheus needs a toolchain w/ C++" comment "write_prometheus needs a toolchain w/ C++, host gcc >= 7"
depends on !BR2_INSTALL_LIBSTDCPP depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_7
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
config BR2_PACKAGE_COLLECTD_WRITEREDIS config BR2_PACKAGE_COLLECTD_WRITEREDIS

6
package/criu/Config.in
View File

@@ -18,6 +18,7 @@ config BR2_PACKAGE_CRIU_ARCH_SUPPORTS
config BR2_PACKAGE_CRIU config BR2_PACKAGE_CRIU
bool "criu" bool "criu"
depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS 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
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 # rseq.h
depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h depends on !BR2_TOOLCHAIN_USES_UCLIBC # no aio.h
@@ -43,9 +44,10 @@ config BR2_PACKAGE_CRIU
https://criu.org/Main_Page https://criu.org/Main_Page
comment "criu needs a glibc or musl toolchain w/ threads, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar" comment "criu needs a glibc or musl toolchain w/ threads, host gcc >= 7, gcc >= 8, headers >= 4.18, C++, dynamic library, wchar"
depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS depends on BR2_PACKAGE_CRIU_ARCH_SUPPORTS
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \ depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS \
|| !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \ || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_18 \
|| BR2_TOOLCHAIN_USES_UCLIBC || !BR2_INSTALL_LIBSTDCPP \ || BR2_TOOLCHAIN_USES_UCLIBC || !BR2_INSTALL_LIBSTDCPP \
|| BR2_STATIC_LIBS || !BR2_USE_WCHAR || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
|| BR2_HOST_GCC_AT_LEAST_7

6
package/kismet/Config.in
View File

@@ -1,8 +1,9 @@
comment "kismet needs a toolchain w/ threads, C++, gcc >= 5" comment "kismet needs a toolchain w/ threads, C++, gcc >= 5, host gcc >= 7"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || \ depends on !BR2_INSTALL_LIBSTDCPP || \
!BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_5 !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
!BR2_HOST_GCC_AT_LEAST_7
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
config BR2_PACKAGE_KISMET config BR2_PACKAGE_KISMET
@@ -11,6 +12,7 @@ config BR2_PACKAGE_KISMET
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork() depends on BR2_USE_MMU # fork()
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c
depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_PROTOBUF_C select BR2_PACKAGE_PROTOBUF_C

5
package/protobuf-c/Config.in
View File

@@ -4,12 +4,13 @@ config BR2_PACKAGE_PROTOBUF_C
depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_THREADS
# host-protobuf only builds on certain architectures # host-protobuf only builds on certain architectures
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS
depends on BR2_HOST_GCC_AT_LEAST_7 # c++17 for host variant
help help
Code generator and runtime libraries to use Protocol Buffers Code generator and runtime libraries to use Protocol Buffers
from pure C (not C++). from pure C (not C++).
https://github.com/protobuf-c/protobuf-c https://github.com/protobuf-c/protobuf-c
comment "protobuf-c needs a toolchain w/ C++, threads" comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_HOST_GCC_AT_LEAST_7
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS

4
package/protobuf-c/protobuf-c.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 4cc4facd508172f3e0a4d3a8736225d472418aee35b4ad053384b137b220339f protobuf-c-1.4.1.tar.gz sha256 7b404c63361ed35b3667aec75cc37b54298d56dd2bcf369de3373212cc06fd98 protobuf-c-1.5.0.tar.gz
sha256 b8999cb392cc5bbe8cd679de59584ad8d2f26033123e76f1d662fa14b9d4f287 LICENSE sha256 ad28bbf89340b86d15aad1ff62c4f4590025d836415307dc66cf0338235cc2f4 LICENSE

6
package/protobuf-c/protobuf-c.mk
View File

@@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
PROTOBUF_C_VERSION = 1.4.1 PROTOBUF_C_VERSION = 1.5.0
PROTOBUF_C_SITE = https://github.com/protobuf-c/protobuf-c/releases/download/v$(PROTOBUF_C_VERSION) PROTOBUF_C_SITE = https://github.com/protobuf-c/protobuf-c/releases/download/v$(PROTOBUF_C_VERSION)
PROTOBUF_C_DEPENDENCIES = host-protobuf-c PROTOBUF_C_DEPENDENCIES = host-protobuf-c
HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf
@@ -15,8 +15,8 @@ PROTOBUF_C_LICENSE = BSD-2-Clause
PROTOBUF_C_LICENSE_FILES = LICENSE PROTOBUF_C_LICENSE_FILES = LICENSE
PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project PROTOBUF_C_CPE_ID_VENDOR = protobuf-c_project
# host-protobuf needs c++11 (since 3.6.0) # when building with protoc (from host-protobuf) c++17 is now required
HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11" HOST_PROTOBUF_C_CONF_ENV += CXXFLAGS="$(HOST_CXXFLAGS) -std=c++17"
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))

6
package/riemann-c-client/Config.in
View File

@@ -3,6 +3,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT
depends on BR2_INSTALL_LIBSTDCPP # protobuf-c depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS # protobuf-c
depends on BR2_HOST_GCC_AT_LEAST_7 # protobuf-c
select BR2_PACKAGE_PROTOBUF_C select BR2_PACKAGE_PROTOBUF_C
help help
Riemann-c-client is a C client library for the Riemann Riemann-c-client is a C client library for the Riemann
@@ -12,6 +13,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT
https://github.com/algernon/riemann-c-client https://github.com/algernon/riemann-c-client
comment "riemann-c-client needs a toolchain w/ C++, threads" comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 7"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_HOST_GCC_AT_LEAST_7
depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS depends on BR2_PACKAGE_HOST_PROTOBUF_ARCH_SUPPORTS