From f9896138087fd86c8d27a0fff162cfa830bb5de0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 23 Jan 2023 18:37:55 -0800 Subject: apt: add missing for uint16_t (From OE-Core rev: 2572b32e729831762790ebfbf930a1140657faea) Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8c46ded67df2d830c8bbf5f7b82d75db81d797e2) Signed-off-by: Steve Sakoman --- .../0001-add-missing-cstdint-for-uint16_t.patch | 35 ++++++++++++++++++++++ meta/recipes-devtools/apt/apt_2.4.5.bb | 1 + 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch diff --git a/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch b/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch new file mode 100644 index 0000000000..44aa8a5873 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch @@ -0,0 +1,35 @@ +From 960d10e89cf60d39998dae6fdcd4f0866b753a79 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 23 Jan 2023 12:31:35 -0800 +Subject: [PATCH] add missing for uint16_t + +This fixes build problems with gcc 13 snapshot [1] + +Fixes +| include/apt-pkg/pkgcache.h:257:23: warning: cast from 'char*' to 'const uint16_t*' {aka 'const short unsigned int*'} increases required alignment of target type [-Wcast-align] +| 257 | uint16_t len = *reinterpret_cast(name - sizeof(uint16_t)); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html + +Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/276] +Signed-off-by: Khem Raj +--- + apt-pkg/contrib/mmap.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc +index 642e20473..0568e1cd0 100644 +--- a/apt-pkg/contrib/mmap.cc ++++ b/apt-pkg/contrib/mmap.cc +@@ -23,6 +23,7 @@ + #include + #include + ++#include + #include + #include + #include +-- +2.39.1 + diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb index 9ebcdfd527..9ceabcc186 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-cmake-Do-not-build-po-files.patch \ file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ file://0001-aptwebserver.cc-Include-array.patch \ + file://0001-add-missing-cstdint-for-uint16_t.patch \ " SRC_URI:append:class-native = " \ -- cgit v1.2.3-54-g00ecf