diff options
Diffstat (limited to 'security/cryptopp/files')
| -rw-r--r-- | security/cryptopp/files/patch-GNUmakefile | 29 | ||||
| -rw-r--r-- | security/cryptopp/files/patch-cpu.h | 17 | ||||
| -rw-r--r-- | security/cryptopp/files/patch-sse-simd.cpp | 13 |
3 files changed, 19 insertions, 40 deletions
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile index 4e7fb30ea3a7..3e73b7ea6372 100644 --- a/security/cryptopp/files/patch-GNUmakefile +++ b/security/cryptopp/files/patch-GNUmakefile @@ -2,19 +2,28 @@ We need to export the CRYPTOPP_DISABLE_ASM flag if cryptopp was not built with SIMD support. Certain functions prototypes are guarded by this flag and build failures will arise in other ports if not set appropriately. ---- GNUmakefile.orig 2018-04-08 08:47:12 UTC +--- GNUmakefile.orig 2019-04-28 23:36:50 UTC +++ GNUmakefile -@@ -90,7 +90,7 @@ SUNCC_512_OR_LATER := $(shell echo "$(SUNCC_VERSION)" - SUNCC_513_OR_LATER := $(shell echo "$(SUNCC_VERSION)" | $(GREP) -i -c -E "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)") +@@ -57,7 +57,7 @@ ifeq ($(SYSTEMX),) + SYSTEMX := $(shell uname -s 2>/dev/null) + endif - # Enable shared object versioning for Linux --HAS_SOLIB_VERSION := $(IS_LINUX) -+HAS_SOLIB_VERSION := 1 +-IS_LINUX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Linux") ++IS_LINUX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "Linux|FreeBSD") + IS_HURD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "GNU|Hurd") + IS_MINGW := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "MinGW") + IS_CYGWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Cygwin") +@@ -742,7 +742,7 @@ endif - # Fixup SunOS - ifeq ($(IS_SUN),1) -@@ -957,7 +957,7 @@ libcryptopp.pc: - @echo 'Version: 7.0' >> libcryptopp.pc + # Use -pthread whenever it is available. See http://www.hpl.hp.com/techreports/2004/HPL-2004-209.pdf + # http://stackoverflow.com/questions/2127797/gcc-significance-of-pthread-flag-when-compiling +-ifeq ($(DETECT_FEATURES),1) ++ifeq (1,1) + ifeq ($(XLC_COMPILER),1) + ifeq ($(findstring -qthreaded,$(CXXFLAGS)),) + TPROG = TestPrograms/test_pthreads.cxx +@@ -1341,7 +1341,7 @@ libcryptopp.pc: + @echo 'Version: 8.2' >> libcryptopp.pc @echo 'URL: https://cryptopp.com/' >> libcryptopp.pc @echo '' >> libcryptopp.pc - @echo 'Cflags: -I$${includedir}' >> libcryptopp.pc diff --git a/security/cryptopp/files/patch-cpu.h b/security/cryptopp/files/patch-cpu.h deleted file mode 100644 index 11cc6b1df9fb..000000000000 --- a/security/cryptopp/files/patch-cpu.h +++ /dev/null @@ -1,17 +0,0 @@ -Fix build with SIMD on FreeBSD 10.x - ---- cpu.h.orig 2018-04-08 08:47:11 UTC -+++ cpu.h -@@ -614,7 +614,12 @@ inline int GetCacheLineSize() - #define GNU_AS2(x, y) #x ", " #y ";" NEW_LINE - #define GNU_AS3(x, y, z) #x ", " #y ", " #z ";" NEW_LINE - #define GNU_ASL(x) "\n" #x ":" NEW_LINE -+ // clang 5.0.0 and apple clang 9.0.0 don't support numerical backward jumps -+#if (CRYPTOPP_LLVM_CLANG_VERSION >= 30000) || (CRYPTOPP_APPLE_CLANG_VERSION >= 90000) -+ #define GNU_ASJ(x, y, z) ATT_PREFIX ";" NEW_LINE #x " " #y #z ";" NEW_LINE INTEL_PREFIX ";" NEW_LINE -+#else - #define GNU_ASJ(x, y, z) #x " " #y #z ";" NEW_LINE -+#endif - #define AS1(x) GNU_AS1(x) - #define AS2(x, y) GNU_AS2(x, y) - #define AS3(x, y, z) GNU_AS3(x, y, z) diff --git a/security/cryptopp/files/patch-sse-simd.cpp b/security/cryptopp/files/patch-sse-simd.cpp deleted file mode 100644 index 52eddb09bf38..000000000000 --- a/security/cryptopp/files/patch-sse-simd.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Fix build without SIMD on FreeBSD 10.x - ---- sse-simd.cpp.orig 2018-04-08 08:47:12 UTC -+++ sse-simd.cpp -@@ -23,7 +23,7 @@ - #endif - - // Needed by SunCC and MSVC --#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) -+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) && defined(CRYPTOPP_SSE2_ASM_AVAILABLE) - # include <emmintrin.h> - #endif - |