initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,54 @@
|
||||
From 5e4cb613d9bb287e9f54da86f99a51d0338b1faa Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 10 Aug 2021 10:36:53 +0200
|
||||
Subject: [PATCH] sconex/Descriptor.cpp: fix build with gcc 11
|
||||
|
||||
Fix the following build failure with gcc 11:
|
||||
|
||||
In file included from ../sconex/sconex.h:229,
|
||||
from ../sconex/Descriptor.h:63,
|
||||
from Descriptor.cpp:22:
|
||||
Descriptor.cpp: In member function 'void scx::Descriptor::add_stream(scx::Stream*)':
|
||||
Descriptor.cpp:150:22: error: ordered comparison of pointer with integer zero ('scx::Stream*' and 'int')
|
||||
150 | DEBUG_ASSERT(stream>=0,"add_stream() Invalid stream");
|
||||
| ~~~~~~^~~
|
||||
| ^~~~
|
||||
Descriptor.cpp: In member function 'bool scx::Descriptor::remove_stream(scx::Stream*)':
|
||||
Descriptor.cpp:204:22: error: ordered comparison of pointer with integer zero ('scx::Stream*' and 'int')
|
||||
204 | DEBUG_ASSERT(stream>=0,"remove_stream() Invalid stream");
|
||||
| ~~~~~~^~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/ccc9562e83fd2bd312d21b3124be42dfe4b7e850
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/sconemad/sconeserver/pull/4]
|
||||
---
|
||||
sconex/Descriptor.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sconex/Descriptor.cpp b/sconex/Descriptor.cpp
|
||||
index 590adba..4adfd86 100644
|
||||
--- a/sconex/Descriptor.cpp
|
||||
+++ b/sconex/Descriptor.cpp
|
||||
@@ -147,7 +147,7 @@ bool Descriptor::dup(int d)
|
||||
//=============================================================================
|
||||
void Descriptor::add_stream(Stream* stream)
|
||||
{
|
||||
- DEBUG_ASSERT(stream>=0,"add_stream() Invalid stream");
|
||||
+ DEBUG_ASSERT(stream!=0,"add_stream() Invalid stream");
|
||||
|
||||
m_streams.push_back(stream);
|
||||
stream->set_endpoint(this);
|
||||
@@ -201,7 +201,7 @@ void Descriptor::add_stream_after(Stream* stream,const Stream* after)
|
||||
//=============================================================================
|
||||
bool Descriptor::remove_stream(Stream* stream)
|
||||
{
|
||||
- DEBUG_ASSERT(stream>=0,"remove_stream() Invalid stream");
|
||||
+ DEBUG_ASSERT(stream!=0,"remove_stream() Invalid stream");
|
||||
|
||||
std::list<Stream*>::iterator it = m_streams.begin();
|
||||
while (it != m_streams.end()) {
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
menuconfig BR2_PACKAGE_SCONESERVER
|
||||
bool "sconeserver"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Sconeserver is a modular, object-orientated and extremely
|
||||
versatile network server framework for GNU/Linux and
|
||||
UNIX-like platforms.
|
||||
|
||||
http://www.sconemad.com/sconeserver/
|
||||
|
||||
if BR2_PACKAGE_SCONESERVER
|
||||
|
||||
comment "Sconeserver modules"
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_EXAMPLES
|
||||
bool "examples"
|
||||
help
|
||||
Example modules for Sconeserver
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE
|
||||
bool "http::sconesite"
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
http::sconesite module for Sconeserver
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_MYSQL
|
||||
bool "mysql"
|
||||
depends on BR2_USE_MMU # mysql
|
||||
select BR2_PACKAGE_MYSQL
|
||||
help
|
||||
MySQL module for Sconeserver
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_BLUETOOTH
|
||||
bool "bluetooth"
|
||||
depends on BR2_USE_WCHAR # bluez5_utils -> libglib2
|
||||
depends on BR2_USE_MMU # bluez5_utils -> dbus
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez5_utils -> dbus, libglib2
|
||||
depends on !BR2_STATIC_LIBS # bluez5_utils
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils
|
||||
select BR2_PACKAGE_BLUEZ5_UTILS
|
||||
help
|
||||
Bluetooth module for Sconeserver
|
||||
|
||||
comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library, headers >= 3.4"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_RSS
|
||||
bool "rss"
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
RSS module for Sconeserver
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_LOCATION
|
||||
bool "location"
|
||||
depends on BR2_USE_MMU # gpsd
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # gpsd
|
||||
depends on !BR2_STATIC_LIBS # gpsd
|
||||
select BR2_PACKAGE_GPSD
|
||||
help
|
||||
Location module for Sconeserver
|
||||
|
||||
comment "location support needs a toolchain w/ theads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBRARY
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_MATHS
|
||||
bool "maths"
|
||||
select BR2_PACKAGE_MPFR
|
||||
help
|
||||
Mathematics module for Sconeserver
|
||||
|
||||
config BR2_PACKAGE_SCONESERVER_TESTBUILDER
|
||||
bool "testbuilder"
|
||||
help
|
||||
Testbuilder module for Sconeserver
|
||||
|
||||
endif # BR2_PACKAGE_SCONESERVER
|
||||
|
||||
comment "sconeserver needs a toolchain with dynamic library, C++, NPTL"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \
|
||||
|| BR2_STATIC_LIBS
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 dfdbbcd29c089eeb341dd3bbd434cca97fefaa97f94c91525e5953d3ab0a2d9a sconeserver-6b932d7d8dbb700b830205e7111e469cefff490c.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
@@ -0,0 +1,98 @@
|
||||
################################################################################
|
||||
#
|
||||
# sconeserver
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SCONESERVER_VERSION = 6b932d7d8dbb700b830205e7111e469cefff490c
|
||||
SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION))
|
||||
SCONESERVER_LICENSE = GPL-2.0+
|
||||
SCONESERVER_LICENSE_FILES = COPYING
|
||||
# fetching from Git, we need to generate the configure script
|
||||
SCONESERVER_AUTORECONF = YES
|
||||
SCONESERVER_DEPENDENCIES = \
|
||||
host-pkgconf \
|
||||
$(if $(BR2_PACKAGE_PCRE),pcre) \
|
||||
zlib
|
||||
# disable image as it fails to build with ImageMagick
|
||||
# disable markdown module because its git submodule cmark
|
||||
# https://github.com/sconemad/sconeserver/tree/master/markdown
|
||||
# has no cross-compile support provided by the sconeserver build system
|
||||
SCONESERVER_CONF_OPTS += \
|
||||
--with-ip \
|
||||
--with-local \
|
||||
--with-ip6 \
|
||||
--without-image \
|
||||
--without-markdown
|
||||
|
||||
# Sconeserver configure script fails to find the libxml2 headers.
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
SCONESERVER_CONF_OPTS += \
|
||||
--with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
SCONESERVER_DEPENDENCIES += openssl
|
||||
SCONESERVER_CONF_OPTS += --with-ssl
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y)
|
||||
SCONESERVER_CONF_OPTS += --with-examples
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-examples
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE),y)
|
||||
SCONESERVER_DEPENDENCIES += libxml2
|
||||
SCONESERVER_CONF_OPTS += --with-sconesite
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-sconesite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
|
||||
SCONESERVER_DEPENDENCIES += mysql
|
||||
SCONESERVER_CONF_OPTS += \
|
||||
--with-mysql \
|
||||
--with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql"
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-mysql
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y)
|
||||
SCONESERVER_DEPENDENCIES += bluez5_utils
|
||||
SCONESERVER_CONF_OPTS += --with-bluetooth
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-bluetooth
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y)
|
||||
SCONESERVER_DEPENDENCIES += libxml2
|
||||
SCONESERVER_CONF_OPTS += --with-rss
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-rss
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y)
|
||||
SCONESERVER_DEPENDENCIES += gpsd
|
||||
SCONESERVER_CONF_OPTS += --with-location
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-location
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y)
|
||||
SCONESERVER_DEPENDENCIES += mpfr
|
||||
SCONESERVER_CONF_OPTS += --with-maths
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-maths
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y)
|
||||
SCONESERVER_CONF_OPTS += --with-testbuilder
|
||||
else
|
||||
SCONESERVER_CONF_OPTS += --without-testbuilder
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user