wireshark: Add nghttp2 packageconfig
PATCH 1/12 wireshark: Add nghttp2 packageconfig
Ensures that clang does not enable it when nghttp2-native is staged in native sysroot.
--- meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb | 1 + 1 file changed, 1 insertion(+)
meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb +1 -0
@@ -46,6 +46,7 @@ PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" PACKAGECONFIG[libssh] = ",,libssh2" PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" +PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers PACKAGECONFIG[c-ares] = "-DENABLE_CARES=ON,-DENABLE_CARES=OFF, c-ares"
Signature · 1 line
2.39.1
PATCH 2/12 rdma-core: Inherit python3targetconfig
It uses python3-config during build to grok the python specific includedirs, therefore its important to ensure that target specific python3-config is used, otherwise currently it defaults to native python3-config which ends up adding native python3 include paths which might work out ok but is exposed when target is 32bit + lfs enabled, the headers don't match between native and target python
--- meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/rdma-core/rdma-core_42.0.bb +1 -1
@@ -28,7 +28,7 @@ FILES_SOLIBSDEV = "" FILES:${PN} += "${libdir}/*" INSANE_SKIP:${PN} += "dev-so" -inherit cmake cpan-base pkgconfig python3native systemd +inherit cmake cpan-base pkgconfig python3native python3targetconfig systemd SYSTEMD_SERVICE:${PN} = " \ srp_daemon.service \
Signature · 1 line
2.39.1
PATCH 3/12 wireshark: Inherit python3targetconfig
In reply to Khem RajIt uses python3-config during build to grok the python specific includedirs, therefore its important to ensure that target specific python3-config is used, otherwise currently it defaults to native python3-config which ends up adding native python3 include paths which might work out ok but is exposed when target is 32bit + lfs enabled, the headers don't match between native and target python
--- meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/wireshark/wireshark_3.4.12.bb +1 -1
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "881a13303e263b7dc7fe337534c8a541d4914552287879bed30bbe76c5 PE = "1" -inherit cmake pkgconfig python3native perlnative upstream-version-is-even mime mime-xdg +inherit cmake pkgconfig python3native python3targetconfig perlnative upstream-version-is-even mime mime-xdg PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc"
Signature · 1 line
2.39.1
PATCH 4/12 hplip: Inherit python3targetconfig
In reply to Khem RajIt uses python3-config during build to grok the python specific includedirs, therefore its important to ensure that target specific python3-config is used, otherwise currently it defaults to native python3-config which ends up adding native python3 include paths which might work out ok but is exposed when target is 32bit + lfs enabled, the headers don't match between native and target python
--- meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/mercurial/mercurial_6.1.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "python3 python3-native" RDEPENDS:${PN} = "python3 python3-modules" -inherit python3native +inherit python3native python3targetconfig SRC_URI = "https://www.mercurial-scm.org/release/${BP}.tar.gz" SRC_URI[sha256sum] = "86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f"
Signature · 1 line
2.39.1
PATCH 5/12 hplip: Inherit python3targetconfig
In reply to Khem RajIt uses python3-config during build to grok the python specific includedirs, therefore its important to ensure that target specific python3-config is used, otherwise currently it defaults to native python3-config which ends up adding native python3 include paths which might work out ok but is exposed when target is 32bit + lfs enabled, the headers don't match between native and target python
--- meta-oe/recipes-extended/hplip/hplip_3.22.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +1 -1
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1 DEPENDS += "cups python3 libusb" -inherit autotools-brokensep python3-dir python3native pkgconfig systemd +inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd export STAGING_INCDIR export STAGING_LIBDIR
Signature · 1 line
2.39.1
PATCH 6/12 dante: Add -P to preprocessor flags
In reply to Khem Rajconfigure uses AC_PREPROC_IFELSE to check for certain errors from getaddrinfo() it user search operation in a preprocessed file
UNIQUEVALS=sort $ERRVALFILE | uniq | wc -l | awk '{ print $1 }'
However, line numbers are generated into the preprocesser files and they get sorted higher than numbers
gaierrval:
# 130 "conftest.c" 3 4
-3
-P ensures that line numbers are not generated into preprocessed files, so these checks can succeed.
--- meta-networking/recipes-protocols/dante/dante_1.4.3.bb | 1 + 1 file changed, 1 insertion(+)
meta-networking/recipes-protocols/dante/dante_1.4.3.bb +1 -0
@@ -25,6 +25,7 @@ EXTRA_OECONF += "--without-gssapi --sbindir=${bindir}" DEPENDS += "flex-native bison-native libpam libtirpc" inherit autotools-brokensep features_check +CPPFLAGS += "-P" CFLAGS += "-I${STAGING_INCDIR}/tirpc" LIBS += "-ltirpc"
Signature · 1 line
2.39.1
PATCH 7/12 breakpad: Fix build with gcc13
In reply to Khem Raj--- ...-gcc-13-cannot-use-uintptr_t-via-inc.patch | 30 +++++++++++++++++++ .../recipes-devtools/breakpad/breakpad_git.bb | 1 + 2 files changed, 31 insertions(+) create mode 100644 meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch
meta-oe/recipes-devtools/breakpad/breakpad/0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 7ea7ded187b4d739239f3ab7082fcd5a2ccc1eaa Mon Sep 17 00:00:00 2001 +From: mingtaoxt xt <[email protected]> +Date: Wed, 19 Oct 2022 19:36:13 +0800 +Subject: [PATCH] mainline version gcc-13 cannot use "uintptr_t" via "#include <string>" + +Change-Id: I0049bb92658b4226e32783ad4d8271787deef5f3 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166 +Reviewed-by: Mike Frysinger <[email protected]> + +Upstream-Status: Backport [https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3964166] +Signed-of-by: Khem Raj <[email protected]> +--- + src/client/linux/handler/minidump_descriptor.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/client/linux/handler/minidump_descriptor.h b/src/client/linux/handler/minidump_descriptor.h +index 4349b88f..d822c9d9 100644 +--- a/src/client/linux/handler/minidump_descriptor.h ++++ b/src/client/linux/handler/minidump_descriptor.h +@@ -32,6 +32,7 @@ + #include <assert.h> + #include <sys/types.h> + ++#include <cstdint> + #include <string> + + #include "client/linux/handler/microdump_extra_info.h" +-- +2.39.1 +
meta-oe/recipes-devtools/breakpad/breakpad_git.bb +1 -0
@@ -41,6 +41,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad;branch=main;protocol=h file://mcontext.patch \ file://0001-Remove-HAVE_GETCONTEXT-check-to-add-local-implementa.patch \ file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \ + file://0001-mainline-version-gcc-13-cannot-use-uintptr_t-via-inc.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ file://0001-Do-not-add-stack-pointer-to-clobber-list.patch;patchdir=src/third_party/lss \
Signature · 1 line
2.39.1
PATCH 8/12 mongodb: Fix build with gcc13
In reply to Khem Raj--- ...001-free_mon-Include-missing-cstdint.patch | 26 +++++++++++++++++++ .../recipes-dbs/mongodb/mongodb_git.bb | 1 + 2 files changed, 27 insertions(+) create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-free_mon-Include-missing-cstdint.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 5d8218b8a1b5bc71e2a0cf543a000e194daba599 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 29 Jan 2023 17:15:30 -0800 +Subject: [PATCH] free_mon: Include missing <cstdint> + +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 + +Signed-off-by: Khem Raj <[email protected]> +--- + src/mongo/db/free_mon/free_mon_options.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/mongo/db/free_mon/free_mon_options.h ++++ b/src/mongo/db/free_mon/free_mon_options.h +@@ -29,6 +29,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + #include <vector> +
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +1 -0
@@ -33,6 +33,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \ file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ file://0001-The-std-lib-unary-binary_function-base-classes-are-d.patch \ + file://0001-free_mon-Include-missing-cstdint.patch \ " SRC_URI:append:libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \
Signature · 1 line
2.39.1
PATCH 9/12 mongodb: Upgrade to 4.4.18
In reply to Khem RajUse wildchar instead of /opt/ for build paths becasue it might be different when building with ccache
--- .../meta-python/recipes-dbs/mongodb/mongodb_git.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +5 -5
@@ -11,9 +11,9 @@ DEPENDS = "openssl libpcap zlib boost curl python3 \ inherit scons dos2unix siteinfo python3native systemd useradd -PV = "4.4.13" -#v4.4.13 -SRCREV = "df25c71b8674a78e17468f48bcda5285decb9246" +PV = "4.4.18" +#v4.4.18 +SRCREV = "8ed32b5c2c68ebe7f8ae2ebe8d23f36037a17dea" SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://0001-Tell-scons-to-use-build-settings-from-environment-va.patch \ file://0001-Use-long-long-instead-of-int64_t.patch \
@@ -103,8 +103,8 @@ scons_do_install() { # install binaries install -d ${D}${bindir} for i in mongod mongos mongo; do - if [ -f ${B}/build/opt/mongo/$i ]; then - install -m 0755 ${B}/build/opt/mongo/$i ${D}${bindir} + if [ -f ${B}/build/*/mongo/$i ]; then + install -m 0755 ${B}/build/*/mongo/$i ${D}${bindir} else bbnote "$i does not exist" fi
Signature · 1 line
2.39.1
PATCH 10/12 mongodb: Pass MAXLINELENGTH to scons invocation
In reply to Khem RajThis helps in overcoming a problem when using scons with ccache enabled. When commands get longer, then it resorts to using response files to do the operations e.g. @/tmp/tmp96j6icra.lnk when this response file is inboked by compiler it works ok, however, this does not when ccache is used to invoke the complilation. We see errors e.g.
ccache @/tmp/tmppsyij_0v.lnk
ccache: error: execute_noreturn of @/tmp/tmppsyij_0v.lnk failed: No such file or directory
Using MAXLINELENGTH setting ensures that we can use ARG_MAX to extend the length of commandline and hence avoid using response files. This issue is also reported in mongodb [1]
[1] https://jira.mongodb.org/browse/SERVER-38389
--- .../meta-python/recipes-dbs/mongodb/mongodb_git.bb | 1 + 1 file changed, 1 insertion(+)
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +1 -0
@@ -76,6 +76,7 @@ WIREDTIGER:aarch64 = "on" EXTRA_OESCONS = "PREFIX=${prefix} \ DESTDIR=${D} \ + MAXLINELENGTH='2097152' \ LIBPATH=${STAGING_LIBDIR} \ LINKFLAGS='${LDFLAGS}' \ CXXFLAGS='${CXXFLAGS}' \
Signature · 1 line
2.39.1
PATCH 11/12 perfetto: Disable ccache
In reply to Khem RajIt does not build with ccache for some reason, loses the compiler name
--- meta-oe/recipes-devtools/perfetto/perfetto.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-devtools/perfetto/perfetto.bb +2 -0
@@ -32,6 +32,8 @@ DEPENDS += " ninja-native" COMPATIBLE_HOST = "(i.86|x86_64|aarch64|arm).*-linux*" +CCACHE_DISABLE = "1" + FILES:${PN}:append = " \ ${bindir}/tracebox \ "
Signature · 1 line
2.39.1
PATCH 12/12 nodejs: Fix build with gcc13
In reply to Khem Raj--- .../nodejs/nodejs/gcc13.patch | 28 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_18.12.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +28 -0
@@ -0,0 +1,28 @@ +Add missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj <[email protected]> + +--- a/deps/v8/src/base/logging.h ++++ b/deps/v8/src/base/logging.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_LOGGING_H_ + #define V8_BASE_LOGGING_H_ + ++#include <cstdint> + #include <cstring> + #include <sstream> + #include <string> +--- a/deps/v8/src/inspector/v8-string-conversions.h ++++ b/deps/v8/src/inspector/v8-string-conversions.h +@@ -5,6 +5,7 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include <cstdint> + #include <string> + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +1 -0
@@ -25,6 +25,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ + file://gcc13.patch \ " SRC_URI:append:class-target = " \
Signature · 1 line
2.39.1
Re: [oe] [meta-oe][PATCH 12/12] nodejs: Fix build with gcc13
Quoted 19 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- .../nodejs/nodejs/gcc13.patch | 28 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_18.12.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patchmeta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +3
-0@@ -0,0 +1,28 @@ +Add missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longertransitively included [1]. Explicitly include it for uint{32,64}_t.
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch line 7
Quoted 4 lines
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +4
-0+ +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj <[email protected]>
You can add:
Upstream-Status: Backport [
https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0
]
Quoted 51 lines
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +21
-0+ +--- a/deps/v8/src/base/logging.h ++++ b/deps/v8/src/base/logging.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_LOGGING_H_ + #define V8_BASE_LOGGING_H_ + ++#include <cstdint> + #include <cstring> + #include <sstream> + #include <string> +--- a/deps/v8/src/inspector/v8-string-conversions.h ++++ b/deps/v8/src/inspector/v8-string-conversions.h +@@ -5,6 +5,7 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include <cstdint> + #include <string> + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}.You may
meta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +1
-0@@ -25,6 +25,7 @@ SRC_URI = " http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ + file://gcc13.patch \ "SRC_URI:append:class-target = " \
--
2.39.1-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#100856):
https://lists.openembedded.org/g/openembedded-devel/message/100856
Mute This Topic: https://lists.openembedded.org/mt/96622215/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-oe][PATCH 12/12] nodejs: Fix build with gcc13
Quoted 19 lines · Martin Jansa
Quoted 17 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- .../nodejs/nodejs/gcc13.patch | 28 +++++++++++++++++++ .../recipes-devtools/nodejs/nodejs_18.12.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patchmeta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +3
-0@@ -0,0 +1,28 @@ +Add missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
Quoted 9 lines
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch line 7
Quoted 4 lines
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +4
-0+ +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj <[email protected]>You can add:
Upstream-Status: Backport [https://github.com/nodejs/node/commit/0be1c5728173ea9ac42843058e26b6268568acf0]
Thanks for reviewing and providing this info. I have taken the original patch and replaced mine.
Quoted 46 lines
Quoted 46 lines
meta-oe/recipes-devtools/nodejs/nodejs/gcc13.patch new file +21
-0+ +--- a/deps/v8/src/base/logging.h ++++ b/deps/v8/src/base/logging.h +@@ -5,6 +5,7 @@ + #ifndef V8_BASE_LOGGING_H_ + #define V8_BASE_LOGGING_H_ + ++#include <cstdint> + #include <cstring> + #include <sstream> + #include <string> +--- a/deps/v8/src/inspector/v8-string-conversions.h ++++ b/deps/v8/src/inspector/v8-string-conversions.h +@@ -5,6 +5,7 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include <cstdint> + #include <string> + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You maymeta-oe/recipes-devtools/nodejs/nodejs_18.12.1.bb +1
-1@@ -25,6 +25,7 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ file://0001-mips-Use-32bit-cast-for-operand-on-mips32.patch \ + file://gcc13.patch \ " SRC_URI:append:class-target = " \ --2.39.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#100856): https://lists.openembedded.org/g/openembedded-devel/message/100856
Mute This Topic: https://lists.openembedded.org/mt/96622215/3617156
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-