692da6425d
Remove THREADS option - upstream recommends building with threads and the build system now adds the appropriate flags automatically Bump PORTREVISION on consumers due to shared lib version increase PR: 241132 Submitted by: Farid Hajji <farid@hajji.name>
33 lines
1.5 KiB
Text
33 lines
1.5 KiB
Text
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 2019-04-28 23:36:50 UTC
|
|
+++ GNUmakefile
|
|
@@ -57,7 +57,7 @@ ifeq ($(SYSTEMX),)
|
|
SYSTEMX := $(shell uname -s 2>/dev/null)
|
|
endif
|
|
|
|
-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
|
|
|
|
# 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
|
|
+ @echo 'Cflags: -I$${includedir} $(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS))' >> libcryptopp.pc
|
|
@echo 'Libs: -L$${libdir} -lcryptopp' >> libcryptopp.pc
|
|
|
|
# This recipe prepares the distro files
|