diff options
| -rw-r--r-- | meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/snappy/snappy_1.2.2.bb (renamed from meta-oe/recipes-extended/snappy/snappy_1.1.10.bb) | 7 |
2 files changed, 2 insertions, 38 deletions
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 @@ | |||
| 1 | From ecb3bcc283ce740a34d6342cbcda569f3193ade9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: David Michael <fedora.dm0@gmail.com> | ||
| 3 | Date: Mon, 1 May 2023 11:14:32 -0400 | ||
| 4 | Subject: [PATCH] Specifically check for NEON for ARMv8 CPUs. | ||
| 5 | |||
| 6 | The actual NEON implementation uses instructions that are not | ||
| 7 | supported on 32-bit CPUs. Make the CMake test reflect this so that | ||
| 8 | ARMv7 builds succeed again. | ||
| 9 | |||
| 10 | Upstream-Status: Submitted [https://github.com/google/snappy/pull/169] | ||
| 11 | |||
| 12 | Signed-off-by: David Michael <fedora.dm0@gmail.com> | ||
| 13 | Signed-off-by: Alper Ak <alperyasinak1@gmail.com> | ||
| 14 | --- | ||
| 15 | CMakeLists.txt | 4 ++-- | ||
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 19 | index 85afe58e..e8775859 100644 | ||
| 20 | --- a/CMakeLists.txt | ||
| 21 | +++ b/CMakeLists.txt | ||
| 22 | @@ -207,9 +207,9 @@ int main() { | ||
| 23 | check_cxx_source_compiles(" | ||
| 24 | #include <arm_neon.h> | ||
| 25 | int main() { | ||
| 26 | - uint8_t val = 3, dup[8]; | ||
| 27 | + uint8_t val = 3; | ||
| 28 | uint8x16_t v = vld1q_dup_u8(&val); | ||
| 29 | - vst1q_u8(dup, v); | ||
| 30 | + val = vmaxvq_u8(v); | ||
| 31 | return 0; | ||
| 32 | }" SNAPPY_HAVE_NEON) | ||
| 33 | |||
diff --git a/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb b/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." | |||
| 10 | LICENSE = "BSD-3-Clause" | 10 | LICENSE = "BSD-3-Clause" |
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" | 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" |
| 12 | 12 | ||
| 13 | SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \ | 13 | SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main" |
| 14 | file://fix-build-on-32bit-arm.patch" | 14 | SRCREV = "6af9287fbdb913f0794d0148c6aa43b58e63c8e3" |
| 15 | |||
| 16 | SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83" | ||
| 17 | |||
| 18 | 15 | ||
| 19 | inherit cmake pkgconfig | 16 | inherit cmake pkgconfig |
| 20 | 17 | ||
