vulkan-cts,opengl-es-cts: Fix build with gcc-13
PATCH 1/13 vulkan-cts,opengl-es-cts: Fix build with gcc-13
--- .../files/0001-Include-missing-cstdint.patch | 34 +++++++++++ .../files/0001-include-missing-cstdint.patch | 61 +++++++++++++++++++ ...01-vulkancts-Include-missing-cstdint.patch | 32 ++++++++++ .../vk-gl-cts/files/0001-vulkancts.patch | 40 ------------ .../vk-gl-cts/khronos-cts.inc | 2 +- .../vk-gl-cts/opengl-es-cts_3.2.8.0.bb | 3 +- .../vk-gl-cts/vulkan-cts_1.3.3.1.bb | 5 +- 7 files changed, 134 insertions(+), 43 deletions(-) create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch create mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch delete mode 100644 meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch
meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-missing-cstdint.patch new file +34 -0
@@ -0,0 +1,34 @@ +From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 19:19:34 -0800 +Subject: [PATCH] Include missing <cstdint> + +This error is seen with gcc-13 where include headers are not implicitly +included [1] + +Fixes errors e.g. +error: 'uint32_t' does not name a type + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj <[email protected]> +--- + framework/common/tcuDefs.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp +index ad3d0736d..6dfac10fb 100644 +--- a/framework/common/tcuDefs.hpp ++++ b/framework/common/tcuDefs.hpp +@@ -26,6 +26,7 @@ + #include "deDefs.hpp" + #include "qpTestLog.h" + ++#include <cstdint> + #include <string> + #include <stdexcept> + +-- +2.39.1 +
meta-oe/recipes-graphics/vk-gl-cts/files/0001-include-missing-cstdint.patch new file +61 -0
61 lines not on this page · raw message
meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 31 May 2021 17:31:33 -0700 +Subject: [PATCH] vulkancts: Include missing <cstdint> + +Fixes build with gcc-13 + +../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type + 2798 | BufferDataType type = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData())); + | ^~~~~~~~~ + +Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] +Signed-off-by: Khem Raj <[email protected]> +--- + .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +index ab02be1dc..3d3ee4829 100644 +--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp ++++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp +@@ -33,6 +33,7 @@ + #include "deFloat16.h" + #include "vkQueryUtil.hpp" + #include "vkRefUtil.hpp" ++#include <cstdint> + #include <cstring> + #include <vector> + #include <limits> +-- +2.39.1 +
meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Mon, 31 May 2021 17:31:33 -0700 -Subject: [PATCH] vulkancts: - -O_TRUNC value in OperationId enum collides with the macro O_TRUNC -defined in the POSIX header fnctl.h. To avoid the collision undefine -O_TRUNC in this particular sourcefile before its is used in enums -down below. - -This is fixed upstream differently -https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b - -But until we get this module uprev'ed to that, lets use a simpler -workaround - -Upstream-Status: Inappropriate [Fixed Differently] -Signed-off-by: Khem Raj <[email protected]> ---- - .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -index 22e6c75fa..db7f4b54a 100644 ---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -@@ -38,6 +38,10 @@ - #include <limits> - #include <fenv.h> - -+#ifdef O_TRUNC -+#undef O_TRUNC -+#endif -+ - namespace vkt - { - namespace SpirVAssembly --- -2.31.1 -
meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +1 -1
@@ -26,7 +26,7 @@ ANY_OF_DISTRO_FEATURES += "opengl wayland" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" SRC_URI += " \ - file://0001-vulkancts.patch \ + file://0001-vulkancts-Include-missing-cstdint.patch \ file://0001-use-library-sonames-for-linking.patch \ "
meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.8.0.bb +2 -1
@@ -12,7 +12,8 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "d70e01c0be7b8a7d20b186b30b29a75b18bba75d" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src" +SRC_URI += "file://0001-Remove-dead-variable-984.patch;patchdir=external/amber/src \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src" S = "${WORKDIR}/git"
meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.3.1.bb +4 -1
@@ -11,7 +11,10 @@ SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" SRCREV_vulkan-docs = "9b5562187a8ad72c171410b036ceedbc450153ba" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch" +SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ + file://0001-Include-missing-cstdint.patch \ + file://0001-include-missing-cstdint.patch;patchdir=external/amber/src \ +" S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
PATCH 2/13 rocksdb: Fix build with gcc13
--- ...-missing-includes-cstdint-and-cstdio.patch | 70 +++++++++++++++++++ meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb | 1 + 2 files changed, 71 insertions(+) create mode 100644 meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch
meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch new file +70 -0
@@ -0,0 +1,70 @@ +From 6e376601c990abaa5e261d1311f92acb3b370b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] Add missing includes <cstdint> and <cstdio> + +This is needed with GCC 13 and newer [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Backport [https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1] +Signed-off-by: Khem Raj <[email protected]> +--- + .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 1 + + storage/rocksdb/rocksdb/util/string_util.h | 1 + + tpool/aio_linux.cc | 1 + + 6 files changed, 6 insertions(+) + +--- a/db/compaction/compaction_iteration_stats.h ++++ b/db/compaction/compaction_iteration_stats.h +@@ -7,6 +7,7 @@ + + #include <cstdint> + ++#include <cstdint> + #include "rocksdb/rocksdb_namespace.h" + + namespace ROCKSDB_NAMESPACE { +--- a/include/rocksdb/utilities/checkpoint.h ++++ b/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include <cstdint> + #include <string> + #include <vector> + #include "rocksdb/status.h" +--- a/table/block_based/data_block_hash_index.h ++++ b/table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include <cstdint> + #include <string> + #include <vector> + +--- a/util/slice.cc ++++ b/util/slice.cc +@@ -12,6 +12,7 @@ + #include <stdio.h> + + #include <algorithm> ++#include <cstdint> + + #include "rocksdb/convenience.h" + #include "rocksdb/slice_transform.h" +--- a/util/string_util.h ++++ b/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include <cstdint> + #include <sstream> + #include <string> + #include <unordered_map>
meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb +1 -0
@@ -12,6 +12,7 @@ SRCBRANCH = "7.5.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \ file://0001-cmake-Use-exported-target-for-bz2.patch \ + file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ file://ppc64.patch \ file://mips.patch \ file://arm.patch \
Signature · 1 line
2.39.1
PATCH 3/13 rocksdb: Upgrade to 7.9.2
In reply to Khem RajRefresh patches
---
.../files/0001-Add-missing-includes-cstdint-and-cstdio.patch | 2 +-
.../files/0001-cmake-Add-check-for-atomic-support.patch | 2 +-
.../files/0001-cmake-Use-exported-target-for-bz2.patch | 2 +-
meta-oe/recipes-dbs/rocksdb/files/ppc64.patch | 2 +-
.../rocksdb/{rocksdb_7.5.3.bb => rocksdb_7.9.2.bb} | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
rename meta-oe/recipes-dbs/rocksdb/{rocksdb_7.5.3.bb => rocksdb_7.9.2.bb} (96%)meta-oe/recipes-dbs/rocksdb/files/0001-Add-missing-includes-cstdint-and-cstdio.patch +1 -1
@@ -37,7 +37,7 @@ Signed-off-by: Khem Raj <[email protected]> +#include <cstdint> #include <string> #include <vector> - #include "rocksdb/status.h" + --- a/table/block_based/data_block_hash_index.h +++ b/table/block_based/data_block_hash_index.h @@ -5,6 +5,7 @@
meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Add-check-for-atomic-support.patch +1 -1
@@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <[email protected]> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share +@@ -1057,7 +1057,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${A if(WIN32) set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib) else()
meta-oe/recipes-dbs/rocksdb/files/0001-cmake-Use-exported-target-for-bz2.patch +1 -1
@@ -13,7 +13,7 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541] --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,12 +153,7 @@ else() +@@ -154,12 +154,7 @@ else() if(WITH_BZ2) find_package(BZip2 REQUIRED) add_definitions(-DBZIP2)
meta-oe/recipes-dbs/rocksdb/files/ppc64.patch +1 -1
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]> @@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v uint64_t result; - __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result)); + __asm __volatile__("mrs %[rt], cntvct_el0" : [rt] "=r"(result)); return result; -#elif defined(__powerpc__) +#elif defined(__powerpc__) && defined(__GLIBC__)
meta-oe/recipes-dbs/rocksdb/rocksdb_7.9.2.bb renamed from meta-oe/recipes-dbs/rocksdb/rocksdb_7.5.3.bb +2 -2
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837" -SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045" -SRCBRANCH = "7.5.fb" +SRCREV = "444b3f4845dd01b0d127c4b420fdd3b50ad56682" +SRCBRANCH = "7.9.fb" SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \ file://0001-cmake-Add-check-for-atomic-support.patch \
Signature · 1 line
2.39.1
PATCH 4/13 redis-plus-plus: Upgrade to 1.3.7
In reply to Khem Raj---
.../{redis-plus-plus_1.3.5.bb => redis-plus-plus_1.3.7.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-oe/recipes-extended/redis-plus-plus/{redis-plus-plus_1.3.5.bb => redis-plus-plus_1.3.7.bb} (90%)meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb renamed from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.5.bb +1 -1
@@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" -SRCREV = "58084931ed1a056d91fe96da7b9ea81fa023560a" +SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262" S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
PATCH 5/13 redis-plus-plus: Fix build with gcc13
In reply to Khem Raj--- .../files/0001-include-cstdint.patch | 37 +++++++++++++++++++ .../redis-plus-plus/redis-plus-plus_1.3.7.bb | 3 +- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch
meta-oe/recipes-extended/redis-plus-plus/files/0001-include-cstdint.patch new file +37 -0
@@ -0,0 +1,37 @@ +From e74bb5a7ef87e697571181280e6108b89104c02d Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 20:40:56 -0800 +Subject: [PATCH] include <cstdint> + +gcc 13 libstdc++ moved some includes around and as a result <cstdint> +is no longer transitively included [1]. Explicitly include it for uintXX_t. + +Fixes + +../git/src/sw/redis++/utils.h:187:1: error: 'uint16_t' does not name a type + 187 | uint16_t crc16(const char *buf, int len); + | ^~~~~~~~ + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/sewenew/redis-plus-plus/pull/449] +Signed-off-by: Khem Raj <[email protected]> +--- + src/sw/redis++/utils.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sw/redis++/utils.h b/src/sw/redis++/utils.h +index f77f796..ff38f2d 100644 +--- a/src/sw/redis++/utils.h ++++ b/src/sw/redis++/utils.h +@@ -17,6 +17,7 @@ + #ifndef SEWENEW_REDISPLUSPLUS_UTILS_H + #define SEWENEW_REDISPLUSPLUS_UTILS_H + ++#include <cstdint> + #include <cstring> + #include <string> + #include <type_traits> +-- +2.39.1 +
meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.7.bb +2 -1
@@ -4,7 +4,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https" +SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \ + file://0001-include-cstdint.patch" SRCREV = "f3b19a8a1f609d1a1b79002802e5cf8c336dc262" S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
PATCH 6/13 rdfind: Upgrade to 1.5.0 release
In reply to Khem Raj---
.../rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch | 2 +-
.../rdfind/{rdfind_1.4.1.bb => rdfind_1.5.0.bb} | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
rename meta-oe/recipes-support/rdfind/{rdfind_1.4.1.bb => rdfind_1.5.0.bb} (74%)meta-oe/recipes-support/rdfind/rdfind/0001-configure-Fix-check-for-AC_CHECK_LIB.patch +1 -1
@@ -15,7 +15,7 @@ Signed-off-by: Khem Raj <[email protected]> --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_CHECK_HEADER(nettle/sha.h,,[AC_MSG_ER - On Debian-ish systems, use \"apt-get install nettle-dev\" to get a system + On Debian-ish systems, use "apt-get install nettle-dev" to get a system wide nettle install. ])]) -AC_CHECK_LIB(nettle,main,,[AC_MSG_ERROR([
meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb renamed from meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb +1 -2
@@ -9,8 +9,7 @@ SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \ " -SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" -SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" +SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080" inherit autotools
Signature · 1 line
2.39.1
PATCH 7/13 rdfind: Fix build with gcc13
In reply to Khem Raj--- ...-standard-headers-limits-and-cstdint.patch | 54 +++++++++++++++++++ .../recipes-support/rdfind/rdfind_1.5.0.bb | 1 + 2 files changed, 55 insertions(+) create mode 100644 meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch
meta-oe/recipes-support/rdfind/rdfind/0001-include-standard-headers-limits-and-cstdint.patch new file +54 -0
@@ -0,0 +1,54 @@ +From 8c317f0fd5fde95a9aae2319053a196a166aec88 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 21:12:47 -0800 +Subject: [PATCH] include standard headers <limits> and <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer +transitively included [1]. Explicitly include it for uint64_t. + +Fixes errors like below + +../rdfind-1.5.0/rdfind.cc:225:30: error: 'numeric_limits' is not a member of 'std' + 225 | o.maximumfilesize = std::numeric_limits<decltype(o.maximumfilesize)>::max(); + | ^~~~~~~~~~~~~~ + +... + +| ../rdfind-1.5.0/Fileinfo.hh:70:20: error: 'std::int64_t' has not been declared + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/pauldreik/rdfind/pull/129] +Signed-off-by: Khem Raj <[email protected]> +--- + Fileinfo.hh | 1 + + rdfind.cc | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/Fileinfo.hh b/Fileinfo.hh +index 3ffb837..23ed54e 100644 +--- a/Fileinfo.hh ++++ b/Fileinfo.hh +@@ -8,6 +8,7 @@ + #define Fileinfo_hh + + #include <array> ++#include <cstdint> + #include <string> + + // os specific headers +diff --git a/rdfind.cc b/rdfind.cc +index fbd6cb8..64dd8f6 100644 +--- a/rdfind.cc ++++ b/rdfind.cc +@@ -9,6 +9,7 @@ + // std + #include <algorithm> + #include <iostream> ++#include <limits> + #include <string> + #include <vector> + +-- +2.39.1 +
meta-oe/recipes-support/rdfind/rdfind_1.5.0.bb +1 -0
@@ -7,6 +7,7 @@ DEPENDS = "nettle autoconf-archive" SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ file://0001-configure-Fix-check-for-AC_CHECK_LIB.patch \ + file://0001-include-standard-headers-limits-and-cstdint.patch \ " SRC_URI[sha256sum] = "4150ed1256f7b12b928c65113c485761552b9496c433778aac3f9afc3e767080"
Signature · 1 line
2.39.1
PATCH 8/13 libiodbc: Fix SRC_URI to not use gitlab archives
In reply to Khem RajFixes
ERROR: libiodbc: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol [src-uri-bad]
--- meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb +1 -2
@@ -12,8 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ " -SRC_URI = "https://github.com/openlink/iODBC/archive/refs/tags/v3.52.15.tar.gz \ - " +SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" S = "${WORKDIR}/iODBC-${PV}" SRC_URI[sha256sum] = "f6b376b6dffb4807343d6d612ed527089f99869ed91bab0bbbb47fdea5ed6ace"
Signature · 1 line
2.39.1
PATCH 9/13 opensaf: Fix build with gcc13
In reply to Khem Raj--- ...1-include-cstdint-for-uintXX_t-types.patch | 43 ++++++++++++++ ...-Werror-enum-int-mismatch-with-gcc13.patch | 59 +++++++++++++++++++ .../opensaf/opensaf_5.22.01.bb | 2 + 3 files changed, 104 insertions(+) create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch
meta-networking/recipes-daemons/opensaf/opensaf/0001-include-cstdint-for-uintXX_t-types.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 225891675b80beaa9d74ce56809e52c4451df72c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 21:46:22 -0800 +Subject: [PATCH 1/2] include cstdint for uintXX_t types + +GCC-13 needs it [1] + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/imm/immnd/ImmModel.h | 1 + + src/osaf/consensus/consensus_env.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/imm/immnd/ImmModel.h b/src/imm/immnd/ImmModel.h +index 44da470..0660431 100644 +--- a/src/imm/immnd/ImmModel.h ++++ b/src/imm/immnd/ImmModel.h +@@ -22,6 +22,7 @@ + #include <saImmOm.h> + #include <cstdarg> + #include <sys/types.h> ++#include <cstdint> + #include <string> + #include <vector> + #include <map> +diff --git a/src/osaf/consensus/consensus_env.h b/src/osaf/consensus/consensus_env.h +index df4f93a..89ccf46 100644 +--- a/src/osaf/consensus/consensus_env.h ++++ b/src/osaf/consensus/consensus_env.h +@@ -15,6 +15,7 @@ + #ifndef OSAF_CONSENSUS_CONSENSUS_ENV_H_ + #define OSAF_CONSENSUS_CONSENSUS_ENV_H_ + ++#include <cstdint> + #include <string> + #include "base/mutex.h" + +-- +2.39.1 +
meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch new file +59 -0
59 lines not on this page · raw message
meta-networking/recipes-daemons/opensaf/opensaf_5.22.01.bb +2 -0
@@ -30,6 +30,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Use-correct-printf-format-for-__fsblkcnt_t.patch \ file://0001-include-missing-array-header.patch \ file://0002-configure-Disable-selected-warnings.patch \ + file://0001-include-cstdint-for-uintXX_t-types.patch \ + file://0002-Fix-Werror-enum-int-mismatch-with-gcc13.patch \ " SRC_URI[sha256sum] = "f008d53c83087ce2014c6089bc4ef08e14c1b4091298b943f4ceade1aa6bf61e"
Signature · 1 line
2.39.1
PATCH 10/13 crossguid: Fix build with gcc13
In reply to Khem Raj--- .../0001-include-missing-cstdint.patch | 31 +++++++++++++++++++ .../crossguid/crossguid_0.2.2.bb | 3 +- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch
meta-multimedia/recipes-support/crossguid/crossguid/0001-include-missing-cstdint.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include 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 + +Upstream-Status: Submitted [https://github.com/graeme-hill/crossguid/pull/67] +Signed-off-by: Khem Raj <[email protected]> +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <jni.h> + #endif + ++#include <cstdint> + #include <functional> + #include <iostream> + #include <array> +-- +2.39.1 +
meta-multimedia/recipes-support/crossguid/crossguid_0.2.2.bb +2 -1
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1373274bc8d8001edc54933919f36f68" DEPENDS += "util-linux" SRCREV = "ca1bf4b810e2d188d04cb6286f957008ee1b7681" -SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master" +SRC_URI = "git://github.com/graeme-hill/crossguid;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" S = "${WORKDIR}/git"
Signature · 1 line
2.39.1
PATCH 11/13 dbus-cxx: Fix build with gcc13
In reply to Khem Raj--- .../recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb | 1 + .../files/0001-Include-missing-cstdint.patch | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch
meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +1 -0
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ file://0001-Include-typeinfo-for-typeid.patch \ file://0001-include-utility-header.patch \ + file://0001-Include-missing-cstdint.patch \ " SRC_URI:append:libc-musl = " file://fix_build_musl.patch" SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264"
meta-oe/recipes-core/dbus-cxx/files/0001-Include-missing-cstdint.patch new file +30 -0
@@ -0,0 +1,30 @@ +From 56e2cce87445d514c9992ecc19d03bb2115c82d6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 22:17:31 -0800 +Subject: [PATCH] Include 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 + +Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/111] +Signed-off-by: Khem Raj <[email protected]> +--- + dbus-cxx/enums.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbus-cxx/enums.h b/dbus-cxx/enums.h +index 8253a4b..c793fad 100644 +--- a/dbus-cxx/enums.h ++++ b/dbus-cxx/enums.h +@@ -5,6 +5,7 @@ + * * + * This file is part of the dbus-cxx library. * + ***************************************************************************/ ++#include <cstdint> + #include <ostream> + + #ifndef DBUSCXX_ENUMS_H +-- +2.39.1 +
Signature · 1 line
2.39.1
PATCH 12/13 dbus-cxx: Upgrade to 2.3.1
In reply to Khem RajLicense-Update: Swith to new license [1]
Drop upstreamed patches
[1] https://github.com/dbus-cxx/dbus-cxx/commit/efe8d3587104bcd748d990da8b86de9e3ef9a0ed
---
.../{dbus-cxx_2.1.0.bb => dbus-cxx_2.3.1.bb} | 12 +++----
.../0001-Include-typeinfo-for-typeid.patch | 29 -----------------
.../files/0001-include-utility-header.patch | 32 -------------------
.../dbus-cxx/files/fix_build_musl.patch | 12 -------
4 files changed, 4 insertions(+), 81 deletions(-)
rename meta-oe/recipes-core/dbus-cxx/{dbus-cxx_2.1.0.bb => dbus-cxx_2.3.1.bb} (53%)
delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch
delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch
delete mode 100644 meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patchmeta-oe/recipes-core/dbus-cxx/dbus-cxx_2.3.1.bb renamed from meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.1.0.bb +4 -8
@@ -2,16 +2,12 @@ SUMMARY = "D-Bus wrapper in C++ for dbus" HOMEPAGE = "https://dbus-cxx.github.io/" BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" SECTION = "base" -LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83" +LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https \ - file://0001-Include-typeinfo-for-typeid.patch \ - file://0001-include-utility-header.patch \ - file://0001-Include-missing-cstdint.patch \ -" -SRC_URI:append:libc-musl = " file://fix_build_musl.patch" -SRCREV = "73532d6a5faae9c721c2cc9535b8ef32d4d18264" + file://0001-Include-missing-cstdint.patch" +SRCREV = "898f6ea8f7ffe454e81a9337002df555728d4199" DEPENDS = "\ dbus \
meta-oe/recipes-core/dbus-cxx/files/0001-Include-typeinfo-for-typeid.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From e262b6e7cc6271d71405f10c4817b9b3b2b95f05 Mon Sep 17 00:00:00 2001 -From: Oleksandr Kravchuk <[email protected]> -Date: Mon, 13 Dec 2021 02:00:48 +0100 -Subject: [PATCH] Include typeinfo for typeid() - -Otherwise fails with: - error: must '#include <typeinfo>' before using 'typeid' - -Upstream-Status: Submitted -[https://github.com/dbus-cxx/dbus-cxx/pull/83] ---- - dbus-cxx/demangle.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/demangle.h b/dbus-cxx/demangle.h -index b71bcb9..9a4e99b 100644 ---- a/dbus-cxx/demangle.h -+++ b/dbus-cxx/demangle.h -@@ -21,6 +21,7 @@ - #define DBUSCXX_DEMANGLE_H - - #include <string> -+#include <typeinfo> - #include <dbus-cxx/dbus-cxx-config.h> - - #if DBUS_CXX_HAS_CXXABI_H --- -2.25.1 -
meta-oe/recipes-core/dbus-cxx/files/0001-include-utility-header.patch deleted +0 -32
@@ -1,32 +0,0 @@ -From 63170cfcfbf483716ce2599e165db80713fc2706 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Tue, 12 Apr 2022 06:47:19 -0700 -Subject: [PATCH] include utility header - -Needed for exchange from std namespace - -Fixes -dbus-cxx/variant.cpp:135:25: error: 'exchange' is not a member of 'std' - -Upstream-Status: Submitted [https://github.com/dbus-cxx/dbus-cxx/pull/98] - -Signed-off-by: Khem Raj <[email protected]> ---- - dbus-cxx/variant.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dbus-cxx/variant.cpp b/dbus-cxx/variant.cpp -index bcf2684..97b622c 100644 ---- a/dbus-cxx/variant.cpp -+++ b/dbus-cxx/variant.cpp -@@ -11,6 +11,7 @@ - #include <dbus-cxx/dbus-cxx-private.h> - #include <dbus-cxx/signatureiterator.h> - #include <stdint.h> -+#include <utility> - #include "enums.h" - #include "path.h" - #include "signature.h" --- -2.35.1 -
meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch deleted +0 -12
@@ -1,12 +0,0 @@ -diff --git a/dbus-cxx/sasl.cpp b/dbus-cxx/sasl.cpp -index e8a6060..7a76af6 100644 ---- a/dbus-cxx/sasl.cpp -+++ b/dbus-cxx/sasl.cpp -@@ -70,7 +70,7 @@ std::tuple<bool, bool, std::vector<uint8_t>> SASL::authenticate() { - bool success = false; - bool negotiatedFD = false; - std::vector<uint8_t> serverGUID; -- __uid_t uid = getuid(); -+ uid_t uid = getuid(); - std::string line; - std::smatch regex_match;
Signature · 1 line
2.39.1
PATCH 13/13 msktutil: Upgrade to 1.2.1
In reply to Khem Raj---
.../{msktutil_1.2.bb => msktutil_1.2.1.bb} | 5 +--
...figure.ac-Remove-native-include-path.patch | 31 +++++++++++++++++++
2 files changed, 34 insertions(+), 2 deletions(-)
rename meta-oe/recipes-support/msktutil/{msktutil_1.2.bb => msktutil_1.2.1.bb} (75%)
create mode 100644 meta-oe/recipes-support/msktutil/mskutil/0001-configure.ac-Remove-native-include-path.patchmeta-oe/recipes-support/msktutil/msktutil_1.2.1.bb renamed from meta-oe/recipes-support/msktutil/msktutil_1.2.bb +3 -2
@@ -7,8 +7,9 @@ DESCRIPTION = "Msktutil creates user or computer accounts in Active Directory, \ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a" -SRC_URI = "https://github.com/msktutil/msktutil/releases/download/v${PV}/msktutil-${PV}.tar.bz2" -SRC_URI[sha256sum] = "27dc078cbac3186540d8ea845fc0ced6b1d9f844e586ccd9eaa2d9f4650c2ce6" +SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-configure.ac-Remove-native-include-path.patch" +SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" DEPENDS += "krb5 cyrus-sasl openldap"
meta-oe/recipes-support/msktutil/mskutil/0001-configure.ac-Remove-native-include-path.patch new file +31 -0
@@ -0,0 +1,31 @@ +From bf9795ffbda7bb241b708ff261976016efb943b1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 23:12:19 -0800 +Subject: [PATCH] configure.ac: Remove native include path + +On OE com_err.h is found in /usr/include too, therefore adding new path +to include search path is not needed. Moreover it fixed QA checks where +it warns about using build system paths. + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index eaac16f..d23d0b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,7 +134,6 @@ fi + # Fedora, RHEL, Centos has com_err.h in /usr/include/et + AC_CHECK_HEADERS([et/com_err.h]) + if test "$ac_cv_header_et_com_err_h" = "yes"; then +- CPPFLAGS="-I/usr/include/et $CPPFLAGS" + AC_DEFINE(HAVE_COM_ERR_H, 1) + fi + +-- +2.39.1 +
Signature · 1 line
2.39.1