CVS commit: pkgsrc/net/softether

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Oct  1 10:31:46 UTC 2024

Modified Files:
        pkgsrc/net/softether: distinfo
Added Files:
        pkgsrc/net/softether/patches: patch-src_Cedar_CMakeLists.txt

Log Message:
softether: Do not build SSE2-only code on i386.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/softether/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/softether/patches/patch-src_Cedar_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/net/softether/distinfo
diff -u pkgsrc/net/softether/distinfo:1.1 pkgsrc/net/softether/distinfo:1.2
--- pkgsrc/net/softether/distinfo:1.1   Thu Mar  7 11:48:35 2024
+++ pkgsrc/net/softether/distinfo       Tue Oct  1 10:31:46 2024
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2024/03/07 11:48:35 hauke Exp $
+$NetBSD: distinfo,v 1.2 2024/10/01 10:31:46 nia Exp $
 
 BLAKE2s (SoftEtherVPN/SoftEtherVPN-5.02.5181.tar.xz) = 8cd9969ae71a9ff19b974aa2477d1233c620520d9ec3034be77554e8cf56a48d
 SHA512 (SoftEtherVPN/SoftEtherVPN-5.02.5181.tar.xz) = bd263c24e3be886da1426553d91c93ff7b378167366e6cd5bdcf20d2e0687ecabbf986056e3a723a54a79da6e53de991b79f3edd3f4b8427b20be28a02e946c8
 Size (SoftEtherVPN/SoftEtherVPN-5.02.5181.tar.xz) = 8472688 bytes
 SHA1 (patch-src_CMakeLists.txt) = 4d05be1d08775d5ace7bf8b79cd07dc068b1150f
 SHA1 (patch-src_Cedar_BridgeUnix.c) = b4a0aeefc96f0cd375e98509bf72cd986099809f
+SHA1 (patch-src_Cedar_CMakeLists.txt) = 74fae7861d03741bf171a315a6e26e51b8cefd03
 SHA1 (patch-src_Cedar_VLanUnix.c) = 5fad45434861af0837551b39106c273a7cdea672
 SHA1 (patch-src_Mayaqua_Unix.c) = 7232c56f333d29b6b6a2f55577cc67760019d932

Added files:

Index: pkgsrc/net/softether/patches/patch-src_Cedar_CMakeLists.txt
diff -u /dev/null pkgsrc/net/softether/patches/patch-src_Cedar_CMakeLists.txt:1.1
--- /dev/null   Tue Oct  1 10:31:46 2024
+++ pkgsrc/net/softether/patches/patch-src_Cedar_CMakeLists.txt Tue Oct  1 10:31:46 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Cedar_CMakeLists.txt,v 1.1 2024/10/01 10:31:46 nia Exp $
+
+Do not build the SSE2-only code on i386.
+
+--- src/Cedar/CMakeLists.txt.orig      2024-10-01 10:26:07.337142644 +0000
++++ src/Cedar/CMakeLists.txt
+@@ -29,7 +29,7 @@ set(BLAKE2_SRC $<IF:$<BOOL:${HAS_SSE2}>,
+ target_include_directories(cedar PUBLIC ${BLAKE2_SRC_PATH})
+ target_sources(cedar PRIVATE ${BLAKE2_SRC})
+ 
+-if(HAS_SSE2)
++if(HAS_SSE2 AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+   # If SSE2 is enabled, a build failure occurs with MSVC because it doesn't define "__SSE2__".
+   # The fix consists in defining "HAVE_SSE2" manually, effectively overriding the check.
+   set_property(SOURCE ${BLAKE2_SRC} PROPERTY COMPILE_DEFINITIONS "HAVE_SSE2")