1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

security/cryptopp: Add patch from pkgsrc

The definition of CRYPTOPP_BOOL_ALIGN16_ENABLED was incorrect for i386.
For NetBSD, this resulted in the inability to build cryptopp on i386.
On FreeBSD, it built, but deskutils/cdcat choked on it while building on
FreeBSD 10/i386 and FreeBSD 11/i386.

PR:		192199
Fix from:	pkgsrc security/crypto++
Discussed:	NetBSD GNATS 48134
Approved by:	delphi@
This commit is contained in:
John Marino 2014-07-30 07:07:16 +00:00
parent 41fa68f92b
commit 24412ff96d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=363448
2 changed files with 30 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= cryptopp
PORTVERSION= 5.6.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= SF \
http://www.cryptopp.com/

View File

@ -0,0 +1,29 @@
--- config.h.orig 2013-02-20 14:30:54.000000000 +0000
+++ config.h
@@ -290,12 +290,6 @@ NAMESPACE_END
#define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0
#endif
-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE)
- #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
-#else
- #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
-#endif
-
// how to allocate 16-byte aligned memory (for SSE2)
#if defined(CRYPTOPP_MSVC6PP_OR_LATER)
#define CRYPTOPP_MM_MALLOC_AVAILABLE
@@ -307,6 +301,13 @@ NAMESPACE_END
#define CRYPTOPP_NO_ALIGNED_ALLOC
#endif
+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC)
+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1
+#else
+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0
+#endif
+
+
// how to disable inlining
#if defined(_MSC_VER) && _MSC_VER >= 1300
# define CRYPTOPP_NOINLINE_DOTDOTDOT