From owner-svn-ports-head@freebsd.org Wed Oct 14 16:39:29 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0DB2DA13463; Wed, 14 Oct 2015 16:39:29 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B32D917A0; Wed, 14 Oct 2015 16:39:28 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9EGdRNb018509; Wed, 14 Oct 2015 16:39:27 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9EGdRGB018507; Wed, 14 Oct 2015 16:39:27 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201510141639.t9EGdRGB018507@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Wed, 14 Oct 2015 16:39:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399276 - in head/mail/rspamd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Oct 2015 16:39:29 -0000 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)