CVS commit: pkgsrc/devel/snappy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Mar 22 07:53:09 UTC 2024

Modified Files:
        pkgsrc/devel/snappy: distinfo
        pkgsrc/devel/snappy/patches: patch-CMakeLists.txt

Log Message:
snappy: armv7 build fix from Paul Ripke on pkgsrc-users


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/snappy/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/snappy/patches/patch-CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/snappy/distinfo
diff -u pkgsrc/devel/snappy/distinfo:1.16 pkgsrc/devel/snappy/distinfo:1.17
--- pkgsrc/devel/snappy/distinfo:1.16   Wed Oct 11 16:09:07 2023
+++ pkgsrc/devel/snappy/distinfo        Fri Mar 22 07:53:09 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2023/10/11 16:09:07 pho Exp $
+$NetBSD: distinfo,v 1.17 2024/03/22 07:53:09 wiz Exp $
 
 BLAKE2s (snappy-1.1.10.tar.gz) = 84a128717b35d7fcd8ce52e03d2efcd71d5928fc19ac5bf0ed3ee99656413541
 SHA512 (snappy-1.1.10.tar.gz) = 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070
 Size (snappy-1.1.10.tar.gz) = 1105312 bytes
-SHA1 (patch-CMakeLists.txt) = ecc43cc15cd58ef8bc7f2fe9ce87322474ee4741
+SHA1 (patch-CMakeLists.txt) = fce9856b530e781968c9e7fca443581685b005ff
 SHA1 (patch-snappy.cc) = c1d3749e9070e1dce6e99691df668d6d9acdee0b

Index: pkgsrc/devel/snappy/patches/patch-CMakeLists.txt
diff -u pkgsrc/devel/snappy/patches/patch-CMakeLists.txt:1.6 pkgsrc/devel/snappy/patches/patch-CMakeLists.txt:1.7
--- pkgsrc/devel/snappy/patches/patch-CMakeLists.txt:1.6        Wed Mar 15 13:29:58 2023
+++ pkgsrc/devel/snappy/patches/patch-CMakeLists.txt    Fri Mar 22 07:53:09 2024
@@ -1,8 +1,9 @@
-$NetBSD: patch-CMakeLists.txt,v 1.6 2023/03/15 13:29:58 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.7 2024/03/22 07:53:09 wiz Exp $
 
 Avoid -Werror.
+Check a different intrinsic to fix build on armv7.
 
---- CMakeLists.txt.orig        2023-03-15 13:20:25.399932889 +0000
+--- CMakeLists.txt.orig        2023-03-08 23:44:00.000000000 +0000
 +++ CMakeLists.txt
 @@ -66,12 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSV
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
@@ -17,3 +18,15 @@ Avoid -Werror.
  
    # Disable C++ exceptions.
    string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+@@ -194,9 +188,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)
+