[Buildroot] [PATCH/next 0/3] Fix non-locale uClibc build of Kodi

[Buildroot] [PATCH/next 0/3] Fix non-locale uClibc build of Kodi

[Bernd Kuhls]

Hi,

this patch series fixes
https://lists.buildroot.org/pipermail/buildroot/2022-August/648240.html

Several steps are necessary:
- bump daq3/snort3 to remove flatbuffers support
  this patch needs to go in first because the current snort3 version
  is incompatible to flatbuffers 2.0.8
- bump flatbuffers, this bump includes
  https://github.com/google/flatbuffers/commit/2ee20a5f3d16bf94140466eba71d04a56c4d4fde
  which, from my pov, simplifies the if-conditions guarding locale
  support
- this simplified if-condition made it possible for me to fix a build
  error with kodi on non-locale toolchains:
  https://lists.buildroot.org/pipermail/buildroot/2022-July/648110.html

Regards, Bernd

Bernd Kuhls (3):
  package/daq3: bump version to 3.0.9
  package/snort3: bump version to 3.1.40.0
  package/flatbuffers: bump version to 2.0.8

 package/daq3/daq3.hash                        |  2 +-
 package/daq3/daq3.mk                          |  2 +-
 ...flatbuffers-base.h-fix-build-on-musl.patch | 20 +++++++++++--------
 package/flatbuffers/flatbuffers.hash          |  2 +-
 package/flatbuffers/flatbuffers.mk            |  2 +-
 package/snort3/snort3.hash                    |  2 +-
 package/snort3/snort3.mk                      |  9 +--------
 7 files changed, 18 insertions(+), 21 deletions(-)

-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH/next 1/3] package/daq3: bump version to 3.0.9

[Bernd Kuhls]

https://github.com/snort3/libdaq/releases/tag/v3.0.9

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/daq3/daq3.hash | 2 +-
 package/daq3/daq3.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/daq3/daq3.hash b/package/daq3/daq3.hash
index a97f81833b..4a24f98173 100644
--- a/package/daq3/daq3.hash
+++ b/package/daq3/daq3.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  4281464c5502037669e69d314b628df863420f590c4999c5b567c8016cd1e658  daq3-3.0.5.tar.gz
+sha256  c0e8535533720a6df05ab884b7c8f5fb4222f3aac12bdc11829e08c79716d338  daq3-3.0.9.tar.gz
 
 # Hash for license files:
 sha256  64601289158eddad72cb4de72652f9e64dc886942c910b38ddee93ba13b0db26  COPYING
diff --git a/package/daq3/daq3.mk b/package/daq3/daq3.mk
index ed97615e61..6ecd1134c7 100644
--- a/package/daq3/daq3.mk
+++ b/package/daq3/daq3.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DAQ3_VERSION = 3.0.5
+DAQ3_VERSION = 3.0.9
 DAQ3_SITE = $(call github,snort3,libdaq,v$(DAQ3_VERSION))
 DAQ3_LICENSE = GPL-2.0
 DAQ3_LICENSE_FILES = COPYING LICENSE
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH/next 2/3] package/snort3: bump version to 3.1.40.0

[Bernd Kuhls]

Changelog: https://github.com/snort3/snort3/blob/master/ChangeLog.md

Removed flatbuffers support due to its upstream removal:
https://github.com/snort3/snort3/commit/3ec185030ef871dbe4a1df997b5880c098aa7101

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/snort3/snort3.hash | 2 +-
 package/snort3/snort3.mk   | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/package/snort3/snort3.hash b/package/snort3/snort3.hash
index 0ba4505a83..7746547d18 100644
--- a/package/snort3/snort3.hash
+++ b/package/snort3/snort3.hash
@@ -1,5 +1,5 @@
 # Locally computed:
-sha256  6e45c16b1815d832b5d6edcd2b705e7838e25c76bfd54b3e86c55ecba6de420a  snort3-3.1.18.0.tar.gz
+sha256  d787d954f21d4cd6a048e10b8c53c78cb6287ec448108fc573b951639c8947b3  snort3-3.1.40.0.tar.gz
 
 # Hash for license files:
 sha256  3f1cbfb20bb2c608e1a474421880d08b8cba6abb00ab7736d22c481d71656a6d  COPYING
diff --git a/package/snort3/snort3.mk b/package/snort3/snort3.mk
index 6f15ce3c92..a76b831838 100644
--- a/package/snort3/snort3.mk
+++ b/package/snort3/snort3.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SNORT3_VERSION = 3.1.18.0
+SNORT3_VERSION = 3.1.40.0
 SNORT3_SITE = $(call github,snort3,snort3,$(SNORT3_VERSION))
 SNORT3_LICENSE = GPL-2.0
 SNORT3_LICENSE_FILES = COPYING LICENSE
@@ -17,13 +17,6 @@ SNORT3_CONF_OPTS = \
 	-DENABLE_STATIC_DAQ=OFF \
 	-DMAKE_DOC=OFF
 
-ifeq ($(BR2_PACKAGE_FLATBUFFERS),y)
-SNORT3_DEPENDENCIES += flatbuffers
-SNORT3_CONF_OPTS += -DHAVE_FLATBUFFERS=ON
-else
-SNORT3_CONF_OPTS += -DHAVE_FLATBUFFERS=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 SNORT3_DEPENDENCIES += libiconv
 SNORT3_CONF_OPTS += -DHAVE_ICONV=ON
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH/next 3/3] package/flatbuffers: bump version to 2.0.8

[Bernd Kuhls]

Updated patch 0001:
- updated upstream status to reflect its rejection
- rebased
- added fix for uClibc build, fixes non-locale kodi build:
  https://lists.buildroot.org/pipermail/buildroot/2022-August/648240.html

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...flatbuffers-base.h-fix-build-on-musl.patch | 20 +++++++++++--------
 package/flatbuffers/flatbuffers.hash          |  2 +-
 package/flatbuffers/flatbuffers.mk            |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch
index b4bc0e12de..82feca3e39 100644
--- a/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch
+++ b/package/flatbuffers/0001-include-flatbuffers-base.h-fix-build-on-musl.patch
@@ -28,7 +28,10 @@ Fixes:
  - http://autobuild.buildroot.org/results/68045b83e94f8caa337b1af7ed5f493ac1a55c47
 
 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: https://github.com/google/flatbuffers/pull/6773]
+[Upstream status: Rejected:
+ https://github.com/google/flatbuffers/pull/6773]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+(rebased and added fix for uClibc-build)
 ---
  include/flatbuffers/base.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -37,15 +40,16 @@ diff --git a/include/flatbuffers/base.h b/include/flatbuffers/base.h
 index de7898dc..101c7598 100644
 --- a/include/flatbuffers/base.h
 +++ b/include/flatbuffers/base.h
-@@ -266,7 +266,7 @@ namespace flatbuffers {
- #ifndef FLATBUFFERS_LOCALE_INDEPENDENT
-   // Enable locale independent functions {strtof_l, strtod_l,strtoll_l, strtoull_l}.
-   #if ((defined(_MSC_VER) && _MSC_VER >= 1800)            || \
--       (defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
-+       (defined(__GLIBC__) && defined(_XOPEN_VERSION) && (_XOPEN_VERSION>=700)) && (!defined(__ANDROID_API__) || (defined(__ANDROID_API__) && (__ANDROID_API__>=21))))
+@@ -264,7 +264,8 @@ namespace flatbuffers {
+   // strtoull_l}.
+   #if (defined(_MSC_VER) && _MSC_VER >= 1800) || \
+       (defined(__ANDROID_API__) && __ANDROID_API__>= 21) || \
+-      (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700)) && \
++      (defined(_XOPEN_VERSION) && (_XOPEN_VERSION >= 700) && \
++        defined(__GLIBC__) && !defined(__UCLIBC__)) && \
+         (!defined(__Fuchsia__) && !defined(__ANDROID_API__))
      #define FLATBUFFERS_LOCALE_INDEPENDENT 1
    #else
-     #define FLATBUFFERS_LOCALE_INDEPENDENT 0
 -- 
 2.30.2
 
diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash
index 6b54dbde92..6382b86f1b 100644
--- a/package/flatbuffers/flatbuffers.hash
+++ b/package/flatbuffers/flatbuffers.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  e2dc24985a85b278dd06313481a9ca051d048f9474e0f199e372fea3ea4248c9  flatbuffers-2.0.6.tar.gz
+sha256  f97965a727d26386afaefff950badef2db3ab6af9afe23ed6d94bfb65f95f37e  flatbuffers-2.0.8.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk
index 2cbd68c346..9d286bf9e1 100644
--- a/package/flatbuffers/flatbuffers.mk
+++ b/package/flatbuffers/flatbuffers.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLATBUFFERS_VERSION = 2.0.6
+FLATBUFFERS_VERSION = 2.0.8
 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION))
 FLATBUFFERS_LICENSE = Apache-2.0
 FLATBUFFERS_LICENSE_FILES = LICENSE.txt
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH/next 1/3] package/daq3: bump version to 3.0.9

[Thomas Petazzoni]

On Thu,  1 Sep 2022 22:12:02 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> https://github.com/snort3/libdaq/releases/tag/v3.0.9
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/daq3/daq3.hash | 2 +-
>  package/daq3/daq3.mk   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Series applied to master, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot