Revert SSE2 disabling on !amd64: it's not necessary with cryptopp>=5.6.1
and we're at 5.6.2... Grrr :(
This commit is contained in:
parent
63f342c8b2
commit
51b4659bfc
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2015/06/24 09:19:49 dcoppa Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2015/06/24 09:41:33 dcoppa Exp $
|
||||
|
||||
COMMENT = C++ library of cryptographic algorithms
|
||||
CATEGORIES = devel security
|
||||
@ -7,7 +7,7 @@ HOMEPAGE = http://www.cryptopp.com/
|
||||
MASTER_SITES = ${HOMEPAGE}
|
||||
DISTNAME = cryptopp562
|
||||
PKGNAME = cryptopp-5.6.2
|
||||
REVISION = 0
|
||||
REVISION = 1
|
||||
|
||||
EXTRACT_SUFX = .zip
|
||||
WRKDIST = ${WRKDIR}
|
||||
@ -35,10 +35,6 @@ MAKE_FLAGS += CXX="${CXX}" \
|
||||
PREFIX=${PREFIX} \
|
||||
LIBcryptopp_VERSION=${LIBcryptopp_VERSION}
|
||||
|
||||
.if ${MACHINE_ARCH} != "amd64"
|
||||
CXXFLAGS += -DCRYPTOPP_DISABLE_SSE2
|
||||
.endif
|
||||
|
||||
MAKE_FILE = ${WRKDIR}/GNUmakefile
|
||||
|
||||
TEST_FLAGS += WRKDIST=${WRKDIST}
|
||||
|
@ -1,15 +1,7 @@
|
||||
$OpenBSD: patch-config_h,v 1.4 2015/06/24 09:19:49 dcoppa Exp $
|
||||
$OpenBSD: patch-config_h,v 1.5 2015/06/24 09:41:33 dcoppa Exp $
|
||||
--- config.h.orig Wed Feb 20 15:30:54 2013
|
||||
+++ config.h Wed Jun 24 09:47:47 2015
|
||||
@@ -1,3 +1,7 @@
|
||||
+#ifndef __x86_64__
|
||||
+#define CRYPTOPP_DISABLE_SSE2
|
||||
+#endif
|
||||
+
|
||||
#ifndef CRYPTOPP_CONFIG_H
|
||||
#define CRYPTOPP_CONFIG_H
|
||||
|
||||
@@ -263,7 +267,7 @@ NAMESPACE_END
|
||||
+++ config.h Wed Jun 24 11:37:28 2015
|
||||
@@ -263,7 +263,7 @@ NAMESPACE_END
|
||||
|
||||
// SSSE3 was actually introduced in GNU as 2.17, which was released 6/23/2006, but we can't tell what version of binutils is installed.
|
||||
// GCC 4.1.2 was released on 2/13/2007, so we'll use that as a proxy for the binutils version.
|
||||
@ -18,7 +10,7 @@ $OpenBSD: patch-config_h,v 1.4 2015/06/24 09:19:49 dcoppa Exp $
|
||||
#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1
|
||||
#else
|
||||
#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
|
||||
@@ -284,13 +288,13 @@ NAMESPACE_END
|
||||
@@ -284,13 +284,13 @@ NAMESPACE_END
|
||||
#define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user