diff options
Diffstat (limited to 'meta-oe/recipes-extended/snappy')
| -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.1.10.bb (renamed from meta-oe/recipes-extended/snappy/snappy_1.1.8.bb) | 13 |
2 files changed, 41 insertions, 5 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 new file mode 100644 index 0000000000..b6ab149e19 --- /dev/null +++ b/meta-oe/recipes-extended/snappy/snappy/fix-build-on-32bit-arm.patch @@ -0,0 +1,33 @@ +From ecb3bcc283ce740a34d6342cbcda569f3193ade9 Mon Sep 17 00:00:00 2001 +From: David Michael <fedora.dm0@gmail.com> +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 <fedora.dm0@gmail.com> +Signed-off-by: Alper Ak <alperyasinak1@gmail.com> +--- + 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 <arm_neon.h> + 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.8.bb b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb index d6d1e4110a..bc3bc3aa47 100644 --- a/meta-oe/recipes-extended/snappy/snappy_1.1.8.bb +++ b/meta-oe/recipes-extended/snappy/snappy_1.1.10.bb @@ -10,10 +10,12 @@ compression ratio." LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=f62f3080324a97b3159a7a7e61812d0c" -SRC_URI = "https://src.fedoraproject.org/repo/pkgs/snappy/snappy-1.1.8.tar.gz/sha512/efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c/snappy-1.1.8.tar.gz" +SRC_URI = "gitsm://github.com/google/snappy.git;protocol=https;branch=main \ + file://fix-build-on-32bit-arm.patch" -SRC_URI[md5sum] = "70e48cba7fecf289153d009791c9977f" -SRC_URI[sha256sum] = "16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f" +SRCREV = "dc05e026488865bc69313a68bcc03ef2e4ea8e83" + +S = "${WORKDIR}/git" inherit cmake pkgconfig @@ -21,5 +23,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[lzo] = "-DHAVE_LIBLZO2=1,-DHAVE_LIBLZO2=0,lzo," TARGET_CFLAGS += "-fPIC" -EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" \ - ' +EXTRA_OECMAKE += '-DBUILD_SHARED_LIBS="ON" -DSNAPPY_BUILD_TESTS="OFF" -DSNAPPY_BUILD_BENCHMARKS="OFF"' + +CVE_PRODUCT = "google:snappy" |