diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2022-04-13 17:07:35 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2022-04-14 02:10:00 +0300 |
| commit | 58776373dfbbda0388940c41752c07c18b4f15cd (patch) | |
| tree | c8a3e0ccd43548d6df30f960de94404009a2baf5 /meta-openembedded/meta-oe | |
| parent | dc43764abca8281445f5d50c2c44cd85b56cc4af (diff) | |
| download | openbmc-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')
25 files changed, 279 insertions, 218 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.30.bb index 72479ce503..f97a1b899d 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.29.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.30.bb @@ -22,7 +22,7 @@ PACKAGECONFIG_NUMA:armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "9b46661c289d01dbfe5182189a7abea9ce2f9e04" +SRCREV = "a3e48f483db27d20e02cbd81e3a8f18c6c5c50f5" SRC_URI = "git://git.kernel.dk/fio.git;branch=master \ " diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch new file mode 100644 index 0000000000..486d6c07be --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl/0001-build-set-HAVE_STATEMENT_EXPR-var.patch @@ -0,0 +1,60 @@ +From b06d16ec2d4aefc4cf1675e9dd6314956bc32d69 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Thu, 7 Apr 2022 14:36:58 +0800 +Subject: [PATCH] build: set HAVE_STATEMENT_EXPR var + +The v73 version tries to build and run a test program at compile +time to check whether compiler supports sizeof and expression statements +and sets HAVE_STATEMENT_EXPR accordingly. This requires EXEWRAPPER_ENABLED +in meson.bbclass to be True and qemu-usermode to be working. + +In cases when EXEWRAPPER_ENABLED is False, build fails with error: + +| ../git/meson.build:213:0: ERROR: Can not run test applications in +this cross environment. + +We don't really need to do this as these have been supported since gcc3 and can set the configs to 1. + +The autotools implementation also used to set it to 1 so this doesn't change anything: + +https://github.com/pmem/ndctl/blob/v72.1/configure.ac#L70 + +Upstream-Status: Inappropriate + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +--- + meson.build | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +diff --git a/meson.build b/meson.build +index 42e11aa..e8d218b 100644 +--- a/meson.build ++++ b/meson.build +@@ -210,22 +210,8 @@ conf.set('ENABLE_DESTRUCTIVE', get_option('destructive').enabled()) + conf.set('ENABLE_LOGGING', get_option('logging').enabled()) + conf.set('ENABLE_DEBUG', get_option('dbg').enabled()) + +-typeof = cc.run(''' +- int main() { +- struct { +- char a[16]; +- } x; +- typeof(x) y; +- +- return sizeof(x) == sizeof(y); +- } +- ''' +-) +- +-if typeof.compiled() and typeof.returncode() == 1 +- conf.set('HAVE_TYPEOF', 1) +- conf.set('HAVE_STATEMENT_EXPR', 1) +-endif ++conf.set('HAVE_TYPEOF', 1) ++conf.set('HAVE_STATEMENT_EXPR', 1) + + if target_machine.endian() == 'big' + conf.set('HAVE_BIG_ENDIAN', 1) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb index c88d392970..da649d578b 100644 --- a/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb +++ b/meta-openembedded/meta-oe/recipes-core/ndctl/ndctl_v73.bb @@ -13,7 +13,8 @@ inherit meson pkgconfig bash-completion systemd SRCREV = "dd58d43458943d20ff063850670bf54a5242c9c5" SRC_URI = "git://github.com/pmem/ndctl.git;branch=main;protocol=https \ file://0001-util-Correct-path-to-iniparser.h.patch \ - file://0001-meson-Use-pkg-config-to-detect-iniparser.patch" + file://0001-meson-Use-pkg-config-to-detect-iniparser.patch \ + file://0001-build-set-HAVE_STATEMENT_EXPR-var.patch" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>v\d+(\.\d+)*)" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 08d9e91704..bc3d4fefeb 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -948,8 +948,8 @@ RDEPENDS:packagegroup-meta-oe-support:remove:arm ="numactl" RDEPENDS:packagegroup-meta-oe-support:remove:mipsarch = "gperftools" RDEPENDS:packagegroup-meta-oe-support:remove:riscv64 = "gperftools uim" RDEPENDS:packagegroup-meta-oe-support:remove:riscv32 = "gperftools uim" -RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "ssiapi tbb" -RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "ssiapi" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc = "libcereal ssiapi tbb" +RDEPENDS:packagegroup-meta-oe-support:remove:powerpc64le = "libcereal ssiapi" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl = "pcp" RDEPENDS:packagegroup-meta-oe-support:remove:libc-musl:powerpc = "gsl" 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 \ diff --git a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb index 85e5072716..8aa8767d37 100644 --- a/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20211224.bb +++ b/meta-openembedded/meta-oe/recipes-extended/byacc/byacc_20220128.bb @@ -4,7 +4,7 @@ # Setting to PD as this is what the upstream has it as. LICENSE = "PD" -LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=e13dd32663e3159031608d536530a080" +LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=62c37a10a2faf90235ee64280ad72737" require byacc.inc -SRC_URI[sha256sum] = "7bc42867a095df2189618b64497016298818e88e513fca792cb5adc9a68ebfb8" +SRC_URI[sha256sum] = "42c1805cc529314e6a76326fe1b33e80c70862a44b01474da362e2f7db2d749c" diff --git a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb index 087b69faae..7343a08c7d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/gnuplot/gnuplot_5.4.3.bb @@ -45,7 +45,8 @@ PACKAGECONFIG[qt5] = "--with-qt --with-qt5nativesysroot=${STAGING_DIR_NATIVE},-- EXTRA_OECONF = " \ --with-readline=${STAGING_LIBDIR}/.. \ - -disable-wxwidgets \ + --disable-wxwidgets \ + --without-libcerf \ " do_compile:prepend() { diff --git a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb index 25007c7773..069fdf7bc2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.17.bb +++ b/meta-openembedded/meta-oe/recipes-extended/haveged/haveged_1.9.18.bb @@ -8,7 +8,7 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM="file://COPYING;md5=d32239bcb673463ab874e80d47fae504" # v1.9.17 -SRCREV = "1ff76272aba9803501e6f473dd5083f0e09289ac" +SRCREV = "80ee9289569bc13efff4e0b5db3661cb513802b2" SRC_URI = "git://github.com/jirka-h/haveged.git;branch=master;protocol=https \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb index 8f41769e02..2817be7c86 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libyang/libyang_2.0.164.bb @@ -21,10 +21,9 @@ COMPATIBLE_HOST:armv5 = "null" COMPATIBLE_HOST:riscv64 = "null" # Main dependencies -inherit cmake pkgconfig lib_package binconfig-disabled ptest +inherit cmake pkgconfig lib_package ptest DEPENDS = "libpcre2" DEPENDS += "${@bb.utils.contains('PTEST_ENABLED', '1', 'cmocka', '', d)}" -BINCONFIG = "${bindir}/pcre2-config" # Ptest dependencies RDEPENDS:${PN}-ptest += "valgrind" diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch new file mode 100644 index 0000000000..7ce206d263 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets/wx-config-fix-libdir-for-multilib.patch @@ -0,0 +1,56 @@ +It sets 'libdir' with path element 'lib' directly which is not suitable for +multilib. Add an option '--baselib' for wx-config to support multilib when +cross compile. And set default value of baselib with "lib${wxPLATFORM_LIB_DIR}". + +Upstream-Status: Pending [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + build/cmake/config.cmake | 2 +- + wx-config.in | 6 ++++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/build/cmake/config.cmake b/build/cmake/config.cmake +index 52ae69d3f6..28aa733eb0 100644 +--- a/build/cmake/config.cmake ++++ b/build/cmake/config.cmake +@@ -86,7 +86,7 @@ function(wx_write_config) + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(includedir "\${prefix}/include") +- set(libdir "\${exec_prefix}/lib") ++ set(libdir "\${exec_prefix}/\${baselib}") + set(bindir "\${exec_prefix}/bin") + + find_program(EGREP egrep) +diff --git a/wx-config.in b/wx-config.in +index e3f7d115bb..0e78af03c7 100755 +--- a/wx-config.in ++++ b/wx-config.in +@@ -42,7 +42,8 @@ usage() + { + cat 1>&2 <<EOF + +- wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--release] [--version-full] ++ wx-config [--prefix[=DIR]] [--exec-prefix[=DIR]][--baselib=DIR] ++ [--release] [--version-full] + [--list] [--selected-config] [--host=HOST] [--toolkit=TOOLKIT] + [--universal[=yes|no]] [--unicode[=yes|no]] [--static[=yes|no]] + [--debug[=yes|no]] [--version[=VERSION]] [--flavour=FLAVOUR] +@@ -137,7 +138,7 @@ wxconfig_output_options="prefix exec_prefix + + # Options that permit the user to supply hints that may affect the output. + # These options all accept arbitrary values, to interpret as they please. +-wxconfig_input_options="prefix exec_prefix utility $wxconfig_schema" ++wxconfig_input_options="prefix exec_prefix baselib utility $wxconfig_schema" + + # Input options that accept only a yes or no argument. + # +@@ -404,6 +405,7 @@ is_cross() { [ "x@cross_compiling@" = "xyes" ]; } + # Determine the base directories we require. + prefix=${input_option_prefix-${this_prefix:-@prefix@}} + exec_prefix=${input_option_exec_prefix-${input_option_prefix-${this_exec_prefix:-@exec_prefix@}}} ++baselib=${input_option_baselib:-lib@wxPLATFORM_LIB_DIR@} + wxconfdir="@libdir@/wx/config" + + installed_configs=`cd "$wxconfdir" 2> /dev/null && ls | grep -v "^inplace-"` diff --git a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb index e821430406..6b57cb54cb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.1.5.bb @@ -24,6 +24,7 @@ SRC_URI = " \ file://fix-libdir-for-multilib.patch \ file://respect-DESTDIR-when-create-link.patch \ file://not-append-system-name-to-lib-name.patch \ + file://wx-config-fix-libdir-for-multilib.patch \ " SRCREV= "9c0a8be1dc32063d91ed1901fd5fcd54f4f955a1" S = "${WORKDIR}/git" @@ -42,10 +43,11 @@ EXTRA_OECMAKE += " \ EXTRA_OECMAKE:append:libc-musl = " \ -DHAVE_LOCALE_T=OFF \ " +EXTRA_OECMAKE:append:class-target = ' -DEGREP="/bin/grep -E"' -# All toolkit-configs except 'no_gui' require x11 explicitly (see toolkit.cmake) -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', 'no_gui', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ +# OpenGL support currently seems tied to using libglu, which requires x11 +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk', 'no_gui', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ " PACKAGECONFIG:remove:class-native = "opengl" @@ -113,4 +115,6 @@ FILES:${PN}-dev += " \ ${libdir}/wx/config/ \ " +RDEPENDS:${PN}-dev += "grep" + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb index 88c6337613..12951e28c5 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.8.bb @@ -10,7 +10,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "9b1edec52cbae97b17530cb5db10666abfb9983f51a5d820c89added6f7b1ea8" +SRC_URI[sha256sum] = "7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb index e135b05c82..f45ea5e4a9 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p2.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/broadcom-bt-firmware/broadcom-bt-firmware_12.0.1.1105_p3.bb @@ -10,7 +10,7 @@ NO_GENERIC_LICENSE[Firmware-Broadcom-WIDCOMM] = "LICENSE.broadcom_bcm20702" LIC_FILES_CHKSUM = "file://LICENSE.broadcom_bcm20702;md5=c0d5ea0502b00df74173d0f8a48b619d" SRC_URI = "git://github.com/winterheart/broadcom-bt-firmware.git;branch=master;protocol=https" -SRCREV = "1af1116f73782951bd7bbe2139928e497c3a634b" +SRCREV = "68a7a8a4f2c4bdd3425c23653a3b9b6609e41d0b" PE = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch deleted file mode 100644 index f3cd1015f9..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi/0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ce3ab6ba4b8176d100ac535a39e3d5b0c517989b Mon Sep 17 00:00:00 2001 -From: Jan Palus <atler@pld-linux.org> -Date: Fri, 15 Jan 2021 14:32:14 +0100 -Subject: [PATCH] configure.ac: remove duplicate AC_CONFIG_MACRO_DIR (#226) - -fixes build with autoconf 2.70 -Upstream-Status: Backport [https://github.com/libusb/hidapi/pull/226] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 220909a..77da67a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" - - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([foreign -Wall -Werror]) --AC_CONFIG_MACRO_DIR([m4]) - - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - LT_INIT --- -2.30.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb index 1fef9789c5..1c57a1d83f 100644 --- a/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/hidapi/hidapi_git.bb @@ -11,9 +11,7 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16" inherit autotools pkgconfig -SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master \ - file://0001-configure.ac-remove-duplicate-AC_CONFIG_MACRO_DIR-22.patch \ -" -PV = "0.10.1" -SRCREV = "f6d0073fcddbdda24549199445e844971d3c9cef" +SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" +PV = "0.11.2" +SRCREV = "31bde69a1f08c880ef1622f2586eea0daf3b0857" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.357.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.358.bb index 01ebf3c909..59513bbb9e 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.357.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.358.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "f9e7eed1b85760028a5157986b3313c99c4d0225" +SRCREV = "ae144d896eea90e527a57276accaf0da043c9f83" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index fb37de3c30..0bb06c1d1f 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -27,6 +27,7 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig ptest LIBATOMIC:mips:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" +LIBATOMIC:riscv32:toolchain-clang = "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCEREAL_THREAD_LIBS="-latomic"', '', d)}" PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}" PACKAGECONFIG[with-tests] = "-DWITH_WERROR=OFF -DBUILD_TESTS=ON ${LIBATOMIC},," @@ -43,3 +44,7 @@ ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" + +#it needs to work with CXXFLAGS += " -mlong-double-64" but ppc64 only supports 128bit long double +COMPATIBLE_HOST:powerpc64le = "null" +COMPATIBLE_HOST:powerpc = "null" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch new file mode 100644 index 0000000000..5b2e14b7b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/0001-tests-Include-missing-sys-socket.h-header.patch @@ -0,0 +1,31 @@ +From aa2362e50d54fce8464d85766f5b230bf453c1f0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 8 Apr 2022 20:15:03 -0700 +Subject: [PATCH] tests: Include missing sys/socket.h header + +Helps define +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:21: error: use of undeclared identifier 'PF_UNIX' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:979:30: error: use of undeclared identifier 'SOCK_STREAM' +| ../../../../libotr-4.1.1/tests/regression/client/client.c:986:20: error: use of undeclared identifier 'AF_UNIX' + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/regression/client/client.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/regression/client/client.c b/tests/regression/client/client.c +index e72b661..e0b3453 100644 +--- a/tests/regression/client/client.c ++++ b/tests/regression/client/client.c +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <syscall.h> + #include <sys/epoll.h> ++#include <sys/socket.h> + #include <sys/types.h> + #include <sys/un.h> + #include <unistd.h> +-- +2.35.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index d9e0e1caa2..115a6968eb 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -7,6 +7,7 @@ DEPENDS = "libgcrypt libgpg-error" SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ file://fix_qa-issue_include.patch \ file://sepbuild.patch \ + file://0001-tests-Include-missing-sys-socket.h-header.patch \ " SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb index ff8191eff6..869c2c86b6 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_git.bb @@ -9,7 +9,7 @@ PV = "1.11.0+git${SRCPV}" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "e2239ee6043f73722e7aa812a459f54a28552929" +SRCREV = "9e712372214d75bb30ec2847a44bf124d48096f3" SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" inherit cmake @@ -26,5 +26,5 @@ do_configure:prepend() { # the scripts are already python3 compatible since https://github.com/google/googletest/commit/d404af0d987a9c38cafce82a7e26ec8468c88361 and other fixes like this # but since this oe-core change http://git.openembedded.org/openembedded-core/commit/?id=5f8f16b17f66966ae91aeabc23e97de5ecd17447 # there isn't python in HOSTTOOLS so "env python" fails - sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/scripts/*py ${S}/googlemock/scripts/generator/*py ${S}/googlemock/scripts/generator/cpp/*py ${S}/googlemock/test/*py ${S}/googletest/scripts/*py ${S}/googletest/test/*py + sed -i 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@g' ${S}/googlemock/test/*py ${S}/googletest/test/*py } |