svn commit: r399276 - in head/mail/rspamd: . files

[Vsevolod Stakhov]

Author: vsevolod
Date: Wed Oct 14 16:39:27 2015
New Revision: 399276
URL: https://svnweb.freebsd.org/changeset/ports/399276

Log:
  Fix build on non-amd64.

Added:
  head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt   (contents, props changed)
Modified:
  head/mail/rspamd/Makefile

Modified: head/mail/rspamd/Makefile
==============================================================================
--- head/mail/rspamd/Makefile	Wed Oct 14 16:21:20 2015	(r399275)
+++ head/mail/rspamd/Makefile	Wed Oct 14 16:39:27 2015	(r399276)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/
 

Added: head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/rspamd/files/patch-src-libcryptobox-CMakeLists.txt	Wed Oct 14 16:39:27 2015	(r399276)
@@ -0,0 +1,36 @@
+diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
+index 80e922f..ccdfba2 100644
+--- src/libcryptobox/CMakeLists.txt
++++ src/libcryptobox/CMakeLists.txt
+@@ -9,6 +9,9 @@ SET(POLYSRC ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/poly1305.c)
+ SET(SIPHASHSRC ${CMAKE_CURRENT_SOURCE_DIR}/siphash/siphash.c
+ 	${CMAKE_CURRENT_SOURCE_DIR}/siphash/ref.c)
+ 
++SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c
++		${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519.c)
++
+ # For now we support only x86_64 architecture with optimizations
+ IF(${ARCH} STREQUAL "x86_64")
+ 	SET(ASM_CODE "vpaddq %ymm0, %ymm0, %ymm0")
+@@ -41,19 +44,14 @@ IF(${ARCH} STREQUAL "x86_64")
+ 	ASM_OP(HAVE_DOLLARMACRO "dollar macro convention")
+ 
+ 	SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-64.c)
++	SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna-c64.c)
+ ELSEIF(${ARCH} STREQUAL "i386")
+ 	SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c)
+-
++	SET(CURVESRC ${CURVESRC} ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c)
+ ELSE()
+-	SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c)
+ 	SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/ref-32.c)
+ ENDIF()
+ 
+-SET(CURVESRC ${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna-c64.c
+-		${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519-donna.c
+-		${CMAKE_CURRENT_SOURCE_DIR}/curve25519/ref.c
+-		${CMAKE_CURRENT_SOURCE_DIR}/curve25519/curve25519.c)
+-
+ IF(HAVE_AVX2)
+ 	SET(CHACHASRC ${CHACHASRC} ${CMAKE_CURRENT_SOURCE_DIR}/chacha20/avx2.S)
+ 	SET(POLYSRC ${POLYSRC} ${CMAKE_CURRENT_SOURCE_DIR}/poly1305/avx2.S)