summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-devtools
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2022-04-13 17:07:35 +0300
committerPatrick Williams <patrick@stwcx.xyz>2022-04-14 02:10:00 +0300
commit58776373dfbbda0388940c41752c07c18b4f15cd (patch)
treec8a3e0ccd43548d6df30f960de94404009a2baf5 /meta-openembedded/meta-oe/recipes-devtools
parentdc43764abca8281445f5d50c2c44cd85b56cc4af (diff)
downloadopenbmc-58776373dfbbda0388940c41752c07c18b4f15cd.tar.xz
subtree updates
meta-raspberrypi: cfbb192e5c..83f5577d8d: AJ Bagwell (1): linux-raspberrypi: add UBOOT_ENTRYPOINT to match LOADADDR poky: ed98f1a1ae..30b38d9cb9: Alexander Kanavin (1): connman-conf: ignore eth0 in qemu in a way that is not sysvinit-specific Chen Qi (1): spirv-tools: fix to use sdk-1.3.204 branch Kevin Hao (1): kernel.bbclass: Fix the do_strip() malfunction Khem Raj (2): libarchive: Upgrade to 3.6.1 musl: Move to 1.2.3 release tag Martin Jansa (1): license_image.bbclass: close package.manifest file Ralph Siemsen (2): xz: fix CVE-2022-1271 gzip: upgrade 1.11 -> 1.12 Richard Purdie (2): uninative: Upgrade to 3.6 with gcc 12 support package_ipk/deb: Fix specific version handling Ross Burton (1): python3-cryptography: backport fix for leaky test meta-openembedded: b9e440ead8..1888971b1f: Andreas Müller (5): octave: add PACKAGECONFIG for (Qt-)gui - disabled by default xfce4-eyes-plugin: upgrade 4.5.1 -> 4.6.0 gnome-online-accounts: upgrade 3.43.1 -> 3.44.0 mutter: upgrade 41.2 -> 42.0 gnome-shell: upgrade 41.2 -> 42.0 Clément Péron (1): grpc: remove unused patches Kai Kang (2): wxwidgets: fix wx-config multilib issue python3-wxgtk4: pass '--baselib' to WX_CONFIG Khem Raj (6): Revert "python3-cppy: upgrade 1.2.0 -> 1.2.1" libotr: Include missing sys/socket.h header libcereal: Link in libatomic on rv32 for ptests gnuplot: Disable libcerf and fix typo libcereal: Disable on ppc/ppc64 evolution-data-server: Disable g-i on musl Markus Volk (1): gparted: update to v1.4.0 Naveen Saini (1): ndctl: fix build failure with EXEWRAPPER_ENABLED False Oleksandr Kravchuk (27): python3-beautifulsoup: update to 4.11.1 python3-bidict: update to 0.22.0 python3-can: update t 4.0.0 python3-elementpath: update to 2.5.0 python3-flask-login: update to 0.6.0 python3-flask: update to 2.1.1 python3-gcovr: update to 5.1 python3-google-api-core: update to 2.7.1 python3-google-auth: update to 2.6.3 python3-grpcio-tools: update to 1.45.0 python3-ipython: update to 8.2.0 python3-jmespath: update to 1.0.0 python3-mypy: update to 0.942 python3-pint: update to 0.19.1 python3-portalocker: update to 2.4.0 python3-pulsectl: update to 22.3.2 python3-pycurl: update to 7.45.1 python3-pymogo: update to 4.1.0 python3-pyscaffold: update to 4.2.1 python3-pytest-helpers-namespace: update to 2021.12.29 python3-pywbem: update to 1.4.1 python3-regex: update to 2022.3.15 python3-sympy: update to 1.10.1 python3-tqdm: update to 4.64.1 python3-twitter: update to 4.8.0 python3-xmlschema: update to 1.10.0 python3-zeroconf: update to 0.38.4 Robert Yang (1): python3-wxgtk4: Require DISTRO_FEATURES as gtk3 Sakib Sajal (1): drbd-utils: update 9.13.1 -> 9.20.2 Scott Murray (1): wxwidgets: Fix building without x11 Stefan Herbrechtsmeier (2): grpc: add cmake support for target grpc: remove useless link with libatomic append Stefan Schmidt (4): ot-br-posix: add recipe for an OpenThread Border Router ot-daemon: add recipe for OpenThread daemon wpantund: add new recipe MAINTAINERS: add entry for OpenThread Willy Tu (1): googletests: Update SRC_URI to 9e71237 to move closer to lastest version Yi Zhao (1): libyang: do not inherit binconfig-disabled wangmy (9): haveged: upgrade 1.9.17 -> 1.9.18 hidapi: upgrade 0.10.1 -> 0.11.2 hwdata: upgrade 0.357 -> 0.358 broadcom-bt-firmware: upgrade 12.0.1.1105_p2 -> 12.0.1.1105_p3 byacc: upgrade 20211224 -> 20220128 ctags: upgrade 5.9.20211114.0 -> 5.9.20220410.0 feh: upgrade 3.6.1 -> 3.8 fio: upgrade 3.29 -> 3.30 grpc: upgrade 1.45.1 -> 1.45.2 Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: Ia6d6cf07c9398a7885df6b31b27019da4d8f01d8
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools')
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220410.0.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb)2
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch93
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch107
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch37
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb (renamed from meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb)25
-rw-r--r--meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb4
6 files changed, 100 insertions, 168 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220410.0.bb
index 504cc24325..96be4e3ffd 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20211114.0.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_5.9.20220410.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
inherit autotools-brokensep pkgconfig manpages
-SRCREV = "a668cb155609d5a322963e1ed9a0c0147c8be597"
+SRCREV = "c4e384715bfa95c7eaf0de99ce2498d54bed182e"
SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
new file mode 100644
index 0000000000..679bd38829
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-add-separate-export-for-plugin-targets.patch
@@ -0,0 +1,93 @@
+From 3150cb043363e05588062dd392b940be25594713 Mon Sep 17 00:00:00 2001
+From: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
+Date: Tue, 18 Feb 2020 14:17:07 +0100
+Subject: [PATCH] cmake: add separate export for plugin targets
+
+Upstream-Status: Submitted [https://github.com/grpc/grpc/pull/29328]
+
+
+---
+ CMakeLists.txt | 18 +++++++++++-------
+ 1 file changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index efdaf8936d..6608b1b00c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10935,7 +10935,7 @@ target_link_libraries(grpc_cpp_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_cpp_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -10975,7 +10975,7 @@ target_link_libraries(grpc_csharp_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_csharp_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11015,7 +11015,7 @@ target_link_libraries(grpc_node_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_node_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_node_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11055,7 +11055,7 @@ target_link_libraries(grpc_objective_c_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_objective_c_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11095,7 +11095,7 @@ target_link_libraries(grpc_php_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_php_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_php_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11135,7 +11135,7 @@ target_link_libraries(grpc_python_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_python_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_python_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -11175,7 +11175,7 @@ target_link_libraries(grpc_ruby_plugin
+
+
+ if(gRPC_INSTALL)
+- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
++ install(TARGETS grpc_ruby_plugin EXPORT gRPCPluginTargets
+ RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
+ BUNDLE DESTINATION ${gRPC_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
+@@ -17349,6 +17349,10 @@ if(gRPC_INSTALL)
+ DESTINATION ${gRPC_INSTALL_CMAKEDIR}
+ NAMESPACE gRPC::
+ )
++ install(EXPORT gRPCPluginTargets
++ DESTINATION ${gRPC_INSTALL_CMAKEDIR}
++ NAMESPACE gRPC::
++ )
+ endif()
+
+ include(CMakePackageConfigHelpers)
+--
+2.30.2
+
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
deleted file mode 100644
index d9cfa009f9..0000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-cmake-revert-db88fb0ee826e73323e06ac6166ac038ee71f6a.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 50d54458324c1a19eefb9968e4cb556dbd34b875 Mon Sep 17 00:00:00 2001
-From: Vyacheslav Yurkov <uvv.mail@gmail.com>
-Date: Tue, 12 Oct 2021 19:11:40 +0200
-Subject: [PATCH] cmake: revert db88fb0ee826e73323e06ac6166ac038ee71f6a
- (#27626)
-
-Fix regression introduced by previous commit. Original problem that
-commit was trying to fix was solved by modification of grpc recipe in
-meta-openembedded project repository
-
-Fixes #26857
-
-Signed-off-by: Vyacheslav Yurkov <uvv.mail@gmail.com>
----
- CMakeLists.txt | 16 ++++++++--------
- templates/CMakeLists.txt.template | 2 --
- 2 files changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0e8fbdee8b..02cd48bee4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -3828,7 +3828,7 @@ foreach(_hdr
- endforeach()
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_plugin_support EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11679,7 +11679,7 @@ target_link_libraries(grpc_cpp_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_cpp_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11718,7 +11718,7 @@ target_link_libraries(grpc_csharp_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_csharp_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11757,7 +11757,7 @@ target_link_libraries(grpc_node_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_node_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11796,7 +11796,7 @@ target_link_libraries(grpc_objective_c_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_objective_c_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11835,7 +11835,7 @@ target_link_libraries(grpc_php_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_php_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11874,7 +11874,7 @@ target_link_libraries(grpc_python_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_python_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-@@ -11913,7 +11913,7 @@ target_link_libraries(grpc_ruby_plugin
-
-
-
--if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
-+if(gRPC_INSTALL)
- install(TARGETS grpc_ruby_plugin EXPORT gRPCTargets
- RUNTIME DESTINATION ${gRPC_INSTALL_BINDIR}
- LIBRARY DESTINATION ${gRPC_INSTALL_LIBDIR}
-diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template
-index 0f0883e09c..b9a5bc4144 100644
---- a/templates/CMakeLists.txt.template
-+++ b/templates/CMakeLists.txt.template
-@@ -695,8 +695,6 @@
- # grpcpp_channelz doesn't build with protobuf-lite, so no install required
- # See https://github.com/grpc/grpc/issues/22826
- if(gRPC_INSTALL AND NOT gRPC_USE_PROTO_LITE)
-- % elif tgt.build == 'protoc':
-- if(gRPC_INSTALL AND NOT CMAKE_CROSSCOMPILING)
- % else:
- if(gRPC_INSTALL)
- % endif
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch
deleted file mode 100644
index faa18bb7f7..0000000000
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc/0001-gsec-Fix-build-on-musl.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9af185be6068d279736c0d2b2162a4e768444d3d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 29 May 2021 00:41:32 -0700
-Subject: [PATCH] gsec: Fix build on musl
-
-musl defines iovec struct in alltypes.h file which is included by many
-system include files, therefore check for appropriate define from musl
-before defining it again
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/core/tsi/alts/crypt/gsec.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/core/tsi/alts/crypt/gsec.h b/src/core/tsi/alts/crypt/gsec.h
-index 4d65caa944..3c367b2895 100644
---- a/src/core/tsi/alts/crypt/gsec.h
-+++ b/src/core/tsi/alts/crypt/gsec.h
-@@ -26,11 +26,14 @@
- #include <stdlib.h>
-
- #include <grpc/grpc.h>
-+#include <sys/uio.h>
-
-+#if !defined(__DEFINED_struct_iovec)
- struct iovec {
- void* iov_base;
- size_t iov_len;
- };
-+#endif
-
- /**
- * A gsec interface for AEAD encryption schemes. The API is thread-compatible.
---
-2.31.1
-
diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb
index 872bc6afcb..48d0f58e20 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.1.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.45.2.bb
@@ -20,10 +20,11 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler"
# RDEPENDS:${PN}-dev += "${PN}-compiler"
S = "${WORKDIR}/git"
-SRCREV_grpc = "1c159689ceda2c408f7f9d97d96a264c9521b806"
+SRCREV_grpc = "b39ffcc425ea990a537f98ec6fe6a1dcb90470d7"
BRANCH = "v1.45.x"
SRC_URI = "git://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \
file://0001-Revert-Changed-GRPCPP_ABSEIL_SYNC-to-GPR_ABSEIL_SYNC.patch \
+ file://0001-cmake-add-separate-export-for-plugin-targets.patch \
"
# Fixes build with older compilers 4.8 especially on ubuntu 14.04
CXXFLAGS:append:class-native = " -Wl,--no-as-needed"
@@ -58,30 +59,8 @@ do_configure:prepend() {
sed -i -e "s#lib/pkgconfig/#${baselib}/pkgconfig/#g" ${S}/CMakeLists.txt
}
-do_configure:prepend:mipsarch() {
- sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:powerpc() {
- sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:riscv64() {
- sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:riscv32() {
- sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
-}
-
-do_configure:prepend:toolchain-clang:x86() {
- sed -i -e "s/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} rt m pthread)/set(_gRPC_ALLTARGETS_LIBRARIES \${CMAKE_DL_LIBS} atomic rt m pthread)/g" ${S}/CMakeLists.txt
-}
-
BBCLASSEXTEND = "native nativesdk"
-SYSROOT_DIRS_IGNORE:append:class-target = " ${baselib}/cmake/grpc"
-
FILES:${PN}-compiler += " \
${bindir} \
${libdir}/libgrpc_plugin_support${SOLIBS} \
diff --git a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb
index a7ff84fad7..a5b00ece8a 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/octave/octave_6.4.0.bb
@@ -34,6 +34,10 @@ SRC_URI = " \
"
SRC_URI[sha256sum] = "b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd"
+# Note: Qt5Help is required for gui -> qttools(-native) must be build with
+# clang in PACKAGECONFIG
+PACKAGECONFIG[gui] = "--with-qt=yes,--with-qt=no,qttools-native qttools qtbase"
+
EXTRA_OECONF = " \
--disable-java \
--disable-docs \