pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] Fix devel/snappy build on armv7



Borrowed from upstream.

-- 
Paul Ripke
"Great minds discuss ideas, average minds discuss events, small minds
 discuss people."
-- Disputed: Often attributed to Eleanor Roosevelt. 1948.
diff --git a/devel/snappy/distinfo b/devel/snappy/distinfo
index 891539fa595c..abed4180ac67 100644
--- a/devel/snappy/distinfo
+++ b/devel/snappy/distinfo
@@ -3,5 +3,5 @@ $NetBSD: distinfo,v 1.16 2023/10/11 16:09:07 pho 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
diff --git a/devel/snappy/patches/patch-CMakeLists.txt b/devel/snappy/patches/patch-CMakeLists.txt
index e2c836a11e61..9c41f6c5e10a 100644
--- a/devel/snappy/patches/patch-CMakeLists.txt
+++ b/devel/snappy/patches/patch-CMakeLists.txt
@@ -1,8 +1,9 @@
 $NetBSD: patch-CMakeLists.txt,v 1.6 2023/03/15 13:29:58 adam 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)
+ 


Home | Main Index | Thread Index | Old Index