diff --git a/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch b/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch deleted file mode 100644 index b6ab149e19..0000000000 --- a/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ecb3bcc283ce740a34d6342cbcda569f3193ade9 Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Mon, 1 May 2023 11:14:32 -0400 -Subject: [PATCH] Specifically check for NEON for ARMv8 CPUs. - -The actual NEON implementation uses instructions that are not -supported on 32-bit CPUs. Make the CMake test reflect this so that -ARMv7 builds succeed again. - -Upstream-Status: Submitted [https://github.com/google/snappy/pull/169] - -Signed-off-by: David Michael -Signed-off-by: Alper Ak ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 85afe58e..e8775859 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -207,9 +207,9 @@ int main() { - check_cxx_source_compiles(" - #include - int main() { -- uint8_t val = 3, dup[8]; -+ uint8_t val = 3; - uint8x16_t v = vld1q_dup_u8(&val); -- vst1q_u8(dup, v); -+ val = vmaxvq_u8(v); - return 0; - }" SNAPPY_HAVE_NEON) - diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb b/meta-oe/recipes-extended/snappy/snappy_1.2.2.bb similarity index 87% rename from meta-oe/recipes-extended/snappy/snappy_1.1.10.bb rename to meta-oe/recipes-extended/snappy/snappy_1.2.2.bb index 2a49ba99b0..7601fdde50 100644 --- a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb +++ b/meta-oe/recipes-extended/snappy/snappy_1.2.2.bb @@ -10,11 +10,8 @@ compression ratio." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \ - file://fix-build-on-32bit-arm.patch" - -SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83" - +SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main" +SRCREV = "6af9287fbdb913f0794d0148c6aa43b58e63c8e3" inherit cmake pkgconfig