diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2022-09-15 23:26:18 -0400 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2022-09-15 23:56:45 -0400 |
| commit | 5a19c0823bb11a2d2da10a3d92a574a8aafcb661 (patch) | |
| tree | 9abec8ddedf592d7915de09722fc31908484d1c8 /security/cryptopp/files/patch-GNUmakefile | |
| parent | finance/kmymoney: Update to 5.1.3 (diff) | |
security/cryptopp: Update to 8.7.0
Drop most of the SIMD logic. The cryptopp Makefile autodetects CPU
features regardless if CPUTYPE is set and it is not possible to disable
specific instruction sets. It is only possible to completely disable
assembly optimizations, which is recommended for package building unless
all consumer machines support the build machine's CPU instruction sets.
Since version 8.1, it is no longer necessary to export
-DCRYPTOPP_DISABLE_ASM to the pkgconfig file. Consumers will now
build without it defined if the SIMD option is disabled. Remove old
workarounds pertaining to this issue.
https://github.com/weidai11/cryptopp/issues/779
Bump PORTREVISION on consumers due to ABI incompatibility.
https://www.cryptopp.com/release870.html
Diffstat (limited to 'security/cryptopp/files/patch-GNUmakefile')
| -rw-r--r-- | security/cryptopp/files/patch-GNUmakefile | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile index 1fc8ef2b3017..8ad66cac17b6 100644 --- a/security/cryptopp/files/patch-GNUmakefile +++ b/security/cryptopp/files/patch-GNUmakefile @@ -1,10 +1,9 @@ -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. +Masquerade as Linux to enable certain build options. +Always use pthread even if feature detection is disabled. ---- GNUmakefile.orig 2021-01-01 17:22:45 UTC +--- GNUmakefile.orig 2022-08-07 19:52:03 UTC +++ GNUmakefile -@@ -71,7 +71,7 @@ ifeq ($(SYSTEMX),) +@@ -70,7 +70,7 @@ endif SYSTEMX := $(shell uname -s 2>/dev/null) endif @@ -13,7 +12,7 @@ flag and build failures will arise in other ports if not set appropriately. 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") -@@ -795,7 +795,7 @@ endif +@@ -848,7 +848,7 @@ endif # 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 @@ -21,13 +20,4 @@ flag and build failures will arise in other ports if not set appropriately. +ifeq (1,1) ifeq ($(XLC_COMPILER),1) ifeq ($(findstring -qthreaded,$(CXXFLAGS)),) - TPROG = TestPrograms/test_pthreads.cxx -@@ -1450,7 +1450,7 @@ libcryptopp.pc: - @echo 'Version: 8.4' >> libcryptopp.pc - @echo 'URL: https://cryptopp.com/' >> libcryptopp.pc - @echo '' >> libcryptopp.pc -- @echo 'Cflags: -I$${includedir}' >> libcryptopp.pc -+ @echo 'Cflags: -I$${includedir} $(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS))' >> libcryptopp.pc - @echo 'Libs: -L$${libdir} -lcryptopp' >> libcryptopp.pc - - # This recipe prepares the distro files + TPROG = TestPrograms/test_pthreads.cpp |