Skip to contentSkip to conversation

zeromq: Fix build with gcc13

PATCH New Khem Raj 1 participant 8 messages Jan 31, 2023 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/8 zeromq: Fix build with gcc13

---
 ...cator.hpp-define-missing-rebind-type.patch | 64 +++++++++++++++++++
 .../zeromq/zeromq_4.3.4.bb                    |  1 +
 2 files changed, 65 insertions(+)
 create mode 100644 meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch
meta-oe/recipes-connectivity/zeromq/files/0001-src-secure_allocator.hpp-define-missing-rebind-type.patch new file +64 -0
new file mode 100644
index 0000000000..d32190818b
@@ -0,0 +1,64 @@
+From 66e72389cc90625ed74e8ba1ea3a65234bdb06b5 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <[email protected]>
+Date: Tue, 20 Dec 2022 21:45:16 +0000
+Subject: [PATCH] src/secure_allocator.hpp: define missing 'rebind' type
+
+`gcc-13` added an assert to standard headers to make sure custom
+allocators have intended implementation of rebind type instead
+of inherited rebind. gcc change:
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
+
+Without the fix build fails on this week's `gcc-13` as:
+
+    [ 92%] Building CXX object tests/CMakeFiles/test_security_curve.dir/test_security_curve.cpp.o
+    In file included from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:34,
+                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_uninitialized.h:64,
+                     from /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/memory:69,
+                     from tests/../src/secure_allocator.hpp:42,
+                     from tests/../src/curve_client_tools.hpp:49,
+                     from tests/test_security_curve.cpp:53:
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<zmq::secure_allocator_t<unsigned char>, unsigned char, void>':
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:94:11:   required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = zmq::secure_allocator_t<unsigned char>; _Up = unsigned char]'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:228:8:   required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = unsigned char; _Alloc = zmq::secure_allocator_t<unsigned char>]'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/ext/alloc_traits.h:126:65:   required from 'struct __gnu_cxx::__alloc_traits<zmq::secure_allocator_t<unsigned char>, unsigned char>::rebind<unsigned char>'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:88:21:   required from 'struct std::_Vector_base<unsigned char, zmq::secure_allocator_t<unsigned char> >'
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/stl_vector.h:423:11:   required from 'class std::vector<unsigned char, zmq::secure_allocator_t<unsigned char> >'
+    tests/../src/curve_client_tools.hpp:64:76:   required from here
+    /<<NIX>>/gcc-13.0.0/include/c++/13.0.0/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
+       70 |                         _Tp>::value,
+          |                               ^~~~~
+
+The change adds trivial `rebind` definition with expected return type
+and satisfies conversion requirements.
+
+Upstream-Status: Backport [https://github.com/zeromq/libzmq/commit/438d5d88]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/secure_allocator.hpp | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/src/secure_allocator.hpp b/src/secure_allocator.hpp
+index 0d37e7ed..5b8de9e2 100644
+--- a/src/secure_allocator.hpp
++++ b/src/secure_allocator.hpp
+@@ -95,6 +95,17 @@ bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
+ #else
+ template <typename T> struct secure_allocator_t : std::allocator<T>
+ {
++    secure_allocator_t () ZMQ_DEFAULT;
++
++    template <class U>
++    secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
++    {
++    }
++
++    template <class U> struct rebind
++    {
++        typedef secure_allocator_t<U> other;
++    };
+ };
+ #endif
+ }
+-- 
+2.39.1
+
meta-oe/recipes-connectivity/zeromq/zeromq_4.3.4.bb +1 -0
index 697bc47137..bf25d56ee9 100644
@@ -8,6 +8,7 @@ PACKAGECONFIG[libsodium] = "-DWITH_LIBSODIUM=ON,-DWITH_LIBSODIUM=OFF, libsodium"
 
 SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV}.tar.gz \
     file://0001-CMakeLists-txt-Avoid-host-specific-path-to-libsodium.patch \
+    file://0001-src-secure_allocator.hpp-define-missing-rebind-type.patch \
     file://run-ptest \
 "
 SRC_URI[md5sum] = "c897d4005a3f0b8276b00b7921412379"
Signature · 1 line
2.39.1
author
#1 lore raw

PATCH 2/8 python3-greenlet: Fix build with gcc13

---
 ...Allocator-define-missing-rebind-type.patch | 56 +++++++++++++++++++
 .../python/python3-greenlet_2.0.1.bb          |  3 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch
meta-python/recipes-devtools/python/python3-greenlet/0001-PythonAllocator-define-missing-rebind-type.patch new file +56 -0
new file mode 100644
index 0000000000..01092025de
@@ -0,0 +1,56 @@
+From 18fb84bb041072503b783ae03c5252f26d2216b8 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 29 Jan 2023 21:42:08 -0800
+Subject: [PATCH] PythonAllocator: define missing 'rebind' type
+
+`gcc-13` added an assert to standard headers to make sure custom
+allocators have intended implementation of rebind type instead
+of inherited rebind. gcc change:
+    https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=64c986b49558a7
+
+Without the fix build fails on this week's `gcc-13` as:
+
+| In file included from ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:34,
+|                  from ../recipe-sysroot/usr/include/c++/13.0.1/bits/basic_string.h:39,
+|                  from ../recipe-sysroot/usr/include/c++/13.0.1/string:54,
+|                  from src/greenlet/greenlet.cpp:10:
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h: In instantiation of 'struct std::__allocator_traits_base::__rebind<greenlet::PythonAllocator<_greenlet*>, _greenlet*, void>':
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:94:11:   required by substitution of 'template<class _Alloc, class _Up> using std::__alloc_rebind = typename std::__allocator_traits_base::__rebind<_Alloc, _Up>::type [with _Alloc = greenlet::PythonAllocator<_greenlet*>; _Up = _greenlet*]'
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:228:8:   required by substitution of 'template<class _Alloc> template<class _Tp> using std::allocator_traits< <template-parameter-1-1> >::rebind_alloc = std::__alloc_rebind<_Alloc, _Tp> [with _Tp = _greenlet*; _Alloc = greenlet::PythonAllocator<_greenlet*>]'
+| ../recipe-sysroot/usr/include/c++/13.0.1/ext/alloc_traits.h:126:65:   required from 'struct __gnu_cxx::__alloc_traits<greenlet::PythonAllocator<_greenlet*>, _greenlet*>::rebind<_greenlet*>'
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:88:21:   required from 'struct std::_Vector_base<_greenlet*, greenlet::PythonAllocator<_greenlet*> >'
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/stl_vector.h:423:11:   required from 'class std::vector<_greenlet*, greenlet::PythonAllocator<_greenlet*> >'
+| src/greenlet/greenlet_thread_state.hpp:115:16:   required from here
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: error: static assertion failed: allocator_traits<A>::rebind_alloc<A::value_type> must be A
+|    70 |                         _Tp>::value,
+|       |                               ^~~~~
+| ../recipe-sysroot/usr/include/c++/13.0.1/bits/alloc_traits.h:70:31: note: 'std::integral_constant<bool, false>::value' evaluates to false
+
+The change adds trivial `rebind` definition with expected return type
+and satisfies conversion requirements.
+
+Upstream-Status: Submitted [https://github.com/python-greenlet/greenlet/pull/344]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/greenlet/greenlet_allocator.hpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/greenlet/greenlet_allocator.hpp b/src/greenlet/greenlet_allocator.hpp
+index 666307d..beaa7ed 100644
+--- a/src/greenlet/greenlet_allocator.hpp
++++ b/src/greenlet/greenlet_allocator.hpp
+@@ -32,6 +32,11 @@ namespace greenlet
+ 
+         PythonAllocator() : std::allocator<T>() {}
+ 
++        template <class U> struct rebind
++        {
++            typedef PythonAllocator<U> other;
++        };
++
+         T* allocate(size_t number_objects, const void* UNUSED(hint)=0)
+         {
+             void* p;
+-- 
+2.39.1
+
meta-python/recipes-devtools/python/python3-greenlet_2.0.1.bb +2 -1
index 4a50a24184..90b5d140d5 100644
@@ -4,7 +4,8 @@ LICENSE = "MIT & PSF-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \
                     file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a"
 
-SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch"
+SRC_URI += "file://0001-greenlet-Drop-using-register-storage-class-keyword.patch \
+            file://0001-PythonAllocator-define-missing-rebind-type.patch"
 
 SRC_URI[sha256sum] = "42e602564460da0e8ee67cb6d7236363ee5e131aa15943b6670e44e5c2ed0f67"
 
Signature · 1 line
2.39.1
author
#2 lore raw

PATCH 3/8 perfetto: Upgrade to 31.0 release

In reply to Khem Raj

Forward port pc file patch to 0.31 release

---
 ...1-meson-add-pc-file-for-lib_perfetto.patch | 25 ++++++++-----------
 .../recipes-devtools/perfetto/perfetto.inc    |  4 +--
 2 files changed, 12 insertions(+), 17 deletions(-)
meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch +10 -15
index 70de44173d..21033eaaa8 100644
@@ -7,17 +7,15 @@ Subject: [PATCH] meson: add PC file for lib_perfetto
  meson.build | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
 
-diff --git a/meson.build b/meson.build
-index 06015141c..752b4d928 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -19,9 +19,12 @@
  project(
      'perfetto',
-     ['c','cpp'],
--    default_options: ['c_std=c99', 'cpp_std=c++11']
-+    default_options: ['c_std=c99', 'cpp_std=c++11'],
-+    version: '27.1'
+     ['cpp'],
+-    default_options: ['cpp_std=c++17']
++    default_options: ['cpp_std=c++17'],
++    version: '31.0'
  )
  
 +soversion = meson.project_version()
@@ -25,20 +23,20 @@ index 06015141c..752b4d928 100644
  fs = import('fs')
  
  if not fs.is_dir('sdk')
-@@ -30,8 +33,9 @@ endif
- 
- dep_threads = dependency('threads')
+@@ -36,8 +39,9 @@ if host_machine.system() == 'android'
+   deps_perfetto += cpp.find_library('log')
+ endif
  
 -lib_perfetto = static_library(
 +lib_perfetto = shared_library(
      'perfetto',
 +    version: soversion,
      sources: 'sdk/perfetto.cc',
-     dependencies: dep_threads,
+     dependencies: deps_perfetto,
      install: true,
-@@ -39,6 +43,10 @@ lib_perfetto = static_library(
+@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu
  
- inc_perfetto = include_directories('sdk')
+ install_data(dir_perfetto_trace / 'perfetto_trace.proto')
  
 +install_headers('sdk/perfetto.h')
 +pkg = import('pkgconfig')
@@ -47,6 +45,3 @@ index 06015141c..752b4d928 100644
  dep_perfetto = declare_dependency(
      link_with: lib_perfetto,
      include_directories: inc_perfetto,
--- 
-2.34.1
-
meta-oe/recipes-devtools/perfetto/perfetto.inc +2 -2
index 5cb6f8bb34..de871d4f3d 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/google/perfetto"
 
 SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1"
 
-SRCREV_perfetto = "1c52b5e132312aeb007ed180d4ba1d8d66227923"
-PV = "27.1"
+SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5"
+PV = "31.0"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
author
#3 lore raw

PATCH 4/8 perfetto: Fix build with gcc13

In reply to Khem Raj
---
 ...ng-header-cstdint-for-uintXX_t-types.patch | 58 +++++++++++++++++++
 meta-oe/recipes-devtools/perfetto/perfetto.bb |  3 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch
meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch new file +58 -0
new file mode 100644
index 0000000000..d08721ae65
@@ -0,0 +1,58 @@
+From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 29 Jan 2023 22:03:01 -0800
+Subject: [PATCH] Add missing header <cstdint> for uintXX_t types
+
+This is detected by gcc-13
+gcc 13 moved some includes around and as a result <cstdint> is no
+longer transitively included [1]. Explicitly include it for uintXX_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ include/perfetto/ext/base/http/sha1.h    | 1 +
+ include/perfetto/ext/base/uuid.h         | 1 +
+ src/traced/probes/common/cpu_freq_info.h | 1 +
+ 3 files changed, 3 insertions(+)
+
+diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h
+index c583d69d4..7e3a48c83 100644
+--- a/include/perfetto/ext/base/http/sha1.h
++++ b/include/perfetto/ext/base/http/sha1.h
+@@ -20,6 +20,7 @@
+ #include <stddef.h>
+ 
+ #include <array>
++#include <cstdint>
+ #include <string>
+ 
+ namespace perfetto {
+diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h
+index 1b4c53815..472042fab 100644
+--- a/include/perfetto/ext/base/uuid.h
++++ b/include/perfetto/ext/base/uuid.h
+@@ -18,6 +18,7 @@
+ #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_
+ 
+ #include <array>
++#include <cstdint>
+ #include <string>
+ 
+ #include "perfetto/ext/base/optional.h"
+diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h
+index 36f7f9c09..8232cbf64 100644
+--- a/src/traced/probes/common/cpu_freq_info.h
++++ b/src/traced/probes/common/cpu_freq_info.h
+@@ -17,6 +17,7 @@
+ #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_
+ #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_
+ 
++#include <cstdint>
+ #include <map>
+ #include <string>
+ #include <vector>
+-- 
+2.39.1
+
meta-oe/recipes-devtools/perfetto/perfetto.bb +2 -1
index 1605de489f..3cc732b700 100644
@@ -17,7 +17,8 @@ SRC_URI:append = " \
            git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \
            git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \
            https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \
-           file://0001-Remove-check_build_deps-build-steps.patch "
+           file://0001-Remove-check_build_deps-build-steps.patch \
+           file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch"
 
 SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3"
 SRCREV_libcxx = "d9040c75cfea5928c804ab7c235fed06a63f743a"
Signature · 1 line
2.39.1
author
#4 lore raw

PATCH 5/8 ntopng: Add hiredis to depends

In reply to Khem Raj

Fails to link otherwise
ld: cannot find -lhiredis: No such file or directory
collect2: error: ld returned 1 exit status

---
 meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/ntopng/ntopng_5.2.1.bb +1 -1
index dca929b574..110ca36866 100644
@@ -6,7 +6,7 @@ usability, and features."
 
 SECTION = "console/network"
 
-DEPENDS = "curl libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq"
+DEPENDS = "curl hiredis libmaxminddb libpcap lua mariadb ndpi json-c rrdtool zeromq"
 RDEPENDS:${PN} = "bash redis"
 LICENSE = "GPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
Signature · 1 line
2.39.1
author
#5 lore raw

PATCH 6/8 python3-grpcio: Fix build with gcc13

In reply to Khem Raj
---
 .../0001-Include-missing-cstdint-header.patch | 32 +++++++++++++++++++
 .../python/python3-grpcio_1.51.1.bb           |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch
meta-python/recipes-devtools/python/python3-grpcio/0001-Include-missing-cstdint-header.patch new file +32 -0
new file mode 100644
index 0000000000..f970cf3c3c
@@ -0,0 +1,32 @@
+From 752e30eebe5b91c323bafcbea8d450dd5683701a Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 30 Jan 2023 10:31:10 -0800
+Subject: [PATCH] Include missing <cstdint> header
+
+gcc 13 moved some includes around and as a result <cstdint> is
+no longer transitively included [1]. Explicitly include it for
+int32_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://code-review.googlesource.com/c/re2/+/60970]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ third_party/re2/util/pcre.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h
+index 896b0bd..271a005 100644
+--- a/third_party/re2/util/pcre.h
++++ b/third_party/re2/util/pcre.h
+@@ -163,6 +163,7 @@
+ 
+ #include "util/util.h"
+ #include "re2/stringpiece.h"
++#include <cstdint>
+ 
+ #ifdef USEPCRE
+ #include <pcre.h>
+-- 
+2.39.1
+
meta-python/recipes-devtools/python/python3-grpcio_1.51.1.bb +1 -0
index b0971db1cc..3d45c56b0a 100644
@@ -10,6 +10,7 @@ SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch"
 SRC_URI:append:class-target = " file://ppc-boringssl-support.patch \
                                 file://boring_ssl.patch \
                                 file://mips_bigendian.patch \
+                                file://0001-Include-missing-cstdint-header.patch \
                                 file://abseil-ppc-fixes.patch;patchdir=third_party/abseil-cpp \
 "
 SRC_URI[sha256sum] = "e6dfc2b6567b1c261739b43d9c59d201c1b89e017afd9e684d85aa7a186c9f7a"
Signature · 1 line
2.39.1
author
#6 lore raw

PATCH 7/8 tesseract: Fix build with gcc13

In reply to Khem Raj
---
 ...ild-with-gcc-13-by-including-cstdint.patch | 32 +++++++++++++++++++
 .../tesseract/tesseract_5.3.0.bb              |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch
meta-oe/recipes-graphics/tesseract/tesseract/0001-Fix-build-with-gcc-13-by-including-cstdint.patch new file +32 -0
new file mode 100644
index 0000000000..2978080c92
@@ -0,0 +1,32 @@
+From 2025b53de6b3d97285d7c5f80497493007c586c3 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Mon, 30 Jan 2023 11:27:07 -0800
+Subject: [PATCH] Fix build with gcc 13 by including <cstdint>
+
+gcc 13 moved some includes around and as a result <cstdint> is
+no longer transitively included [1]. Explicitly include it for
+int32_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Upstream-Status: Submitted [https://github.com/tesseract-ocr/tesseract/pull/4009]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ src/ccutil/params.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/ccutil/params.h b/src/ccutil/params.h
+index f514d870..0f3f8743 100644
+--- a/src/ccutil/params.h
++++ b/src/ccutil/params.h
+@@ -21,6 +21,7 @@
+ 
+ #include <tesseract/export.h> // for TESS_API
+ 
++#include <cstdint>
+ #include <cstdio>
+ #include <cstring>
+ #include <string>
+-- 
+2.39.1
+
meta-oe/recipes-graphics/tesseract/tesseract_5.3.0.bb +1 -1
index f791ad546b..057a7cd859 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCREV = "080da83cc51c4ef8b324a7e03146fe0bd7e0944b"
 SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https \
-          "
+           file://0001-Fix-build-with-gcc-13-by-including-cstdint.patch"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.39.1
author
#7 lore raw

PATCH 8/8 lcdproc: Update to latest tip of trunk

In reply to Khem Raj

Drop patches already present in trunk as of now

---
 .../0001-Fix-compilation-with-GCC-10.x.patch  | 39 ---------------
 ...ld-fix-port-internal-make-dependenci.patch | 33 -------------
 ...ude-limits.h-for-PATH_MAX-definition.patch | 41 ----------------
 .../0003-Fix-non-x86-platforms-on-musl.patch  | 49 -------------------
 .../recipes-extended/lcdproc/lcdproc_git.bb   |  9 +---
 5 files changed, 2 insertions(+), 169 deletions(-)
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch
 delete mode 100644 meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch
meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch deleted +0 -39
deleted file mode 100644
index cd8a69c3fb..0000000000
@@ -1,39 +0,0 @@
-From 9b07f6a472c24f5e1b65746756764391be0d55e4 Mon Sep 17 00:00:00 2001
-From: Harald Geyer <[email protected]>
-Date: Mon, 10 Feb 2020 13:15:10 +0100
-Subject: [PATCH] Fix compilation with GCC >= 10.x
-
-Starting with GCC >= 10.x, -fno-common is used as default
-instead of -fcommon. This patch fixes the compilation.
-
-Closes: #148
-
-Upstream-Status: Backport
-Suggested-by: Conrad Kostecki <[email protected]>
-Signed-off-by: Harald Geyer <[email protected]>
----
- clients/lcdproc/iface.c | 1 +
- clients/lcdproc/iface.h | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
---- a/clients/lcdproc/iface.c
-+++ b/clients/lcdproc/iface.c
-@@ -32,6 +32,7 @@
- #define UNSET_INT -1
- #define UNSET_STR "\01"
- 
-+IfaceInfo iface[MAX_INTERFACES];
- 
- static int iface_count = 0;	/* number of interfaces */
- static char unit_label[10] = "B";	/* default unit label is Bytes */
---- a/clients/lcdproc/iface.h
-+++ b/clients/lcdproc/iface.h
-@@ -18,7 +18,7 @@
- /** max number of interfaces in multi-interface mode */
- #define MAX_INTERFACES 3
- 
--IfaceInfo iface[MAX_INTERFACES];	/* interface info */
-+extern IfaceInfo iface[MAX_INTERFACES];	/* interface info */
- 
- /** Update screen content */
- int iface_screen(int rep, int display, int *flags_ptr);
meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch deleted +0 -33
deleted file mode 100644
index f6a7956db2..0000000000
@@ -1,33 +0,0 @@
-From a20feee4963bc38975fbaf44bbe85a31825f59db Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sat, 6 Apr 2019 17:28:28 -0700
-Subject: [PATCH 1/3] Fix parallel build (fix port-internal make dependencies)
- on many cores
-
-Upstream-Status: Submitted [https://github.com/lcdproc/lcdproc/pull/142]
-Signed-off-by: Khem Raj <[email protected]>
----
- server/drivers/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am
-index e08f2b2d..4fd2e3f1 100644
---- a/server/drivers/Makefile.am
-+++ b/server/drivers/Makefile.am
-@@ -47,11 +47,11 @@ CwLnx_LDADD =        libLCD.a libbignum.a
- futaba_LDADD =       @LIBUSB_LIBS@ @LIBUSB_1_0_LIBS@ libLCD.a
- g15_LDADD =          @LIBG15@
- glcd_LDADD =         libLCD.a @GLCD_DRIVERS@ @FT2_LIBS@ @LIBPNG_LIBS@ @LIBSERDISP@ @LIBUSB_LIBS@ @LIBX11_LIBS@
--glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o
-+glcd_DEPENDENCIES =  @GLCD_DRIVERS@ glcd-glcd-render.o libLCD.a
- glcdlib_LDADD =      @LIBGLCD@
- glk_LDADD =          libbignum.a
- hd44780_LDADD =      libLCD.a @HD44780_DRIVERS@ @HD44780_I2C@ @LIBUSB_LIBS@ @LIBFTDI_LIBS@ @LIBUGPIO@ libbignum.a
--hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@
-+hd44780_DEPENDENCIES = @HD44780_DRIVERS@ @HD44780_I2C@ libLCD.a libbignum.a
- i2500vfd_LDADD =     @LIBFTDI_LIBS@
- imon_LDADD =         libLCD.a libbignum.a
- imonlcd_LDADD =      libLCD.a
--- 
-2.24.1
-
meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0002-Include-limits.h-for-PATH_MAX-definition.patch deleted +0 -41

41 lines not on this page · raw message

meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0003-Fix-non-x86-platforms-on-musl.patch deleted +0 -49

49 lines not on this page · raw message

meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +2 -7
index 76a931666d..4cae4947f2 100644
@@ -10,13 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \
                     file://README.md;beginline=107;md5=5db392f043253a2d64b1737068ce6b58"
 
 PV = "0.5.9+git${SRCPV}"
-SRCREV = "3a3d622d9bb74c44fa67bc20573751a207514134"
-SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https \
-           file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \
-           file://0002-Include-limits.h-for-PATH_MAX-definition.patch \
-           file://0003-Fix-non-x86-platforms-on-musl.patch \
-           file://0001-Fix-compilation-with-GCC-10.x.patch \
-           "
+SRCREV = "0e2ce9b9c46c47363436f9ee730f7c71bf455f0f"
+SRC_URI = "git://github.com/lcdproc/lcdproc;branch=master;protocol=https"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.39.1