diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2018-08-24 17:22:01 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2018-08-24 17:22:01 +0000 |
| commit | edf512ca2e5e5a59e84993103663d499dc54600d (patch) | |
| tree | 755180fd4810fbf33aa78186166afc94eafc7a8e /security/cryptopp/files/patch-GNUmakefile | |
| parent | Update to 0.9.1 (diff) | |
Update security/cryptopp to 7.0.0
We now install a pkgconfig file which will allow ports to check whether
cryptopp was built with assembly instructions enabled or not. There are
a few functions that will be undefined if built without assembly and
-DCRYPTOPP_DISABLE_ASM needs to be passed to the compiler in that case
to avoid build failures. This is not new, but the pkgconf file should
make it easier to determine if the flag is needed or not.
Fix several ports due to API changes and to use the new pkgconf file
to determine cryptopp location and build flags. Special cases below.
deskutils/cdcat
- Use cryptopp shared library instead of static, detect with pkgconf
devel/xeus
- Fix dependencies and remove header-only libraries from RUN_DEPENDS
- Rework to use the cryptopp pkgconf file
- net/cppzmq CMake files were fixed in r477649, remove hacks for that
as they were seemingly causing devel/xeus-cling to link to cryptopp
unnecessarily
- Remove C++17 code from cryptopp checks for compatibility
devel/xeus-cling
- Fix dependencies
- Remove hacks for previously broken cppzmq CMake files and no longer
needed cryptopp dependency
Changes: https://www.cryptopp.com/#news
PR: 230579 (original patch, not used)
Submitted by: yuri
Diffstat (limited to 'security/cryptopp/files/patch-GNUmakefile')
| -rw-r--r-- | security/cryptopp/files/patch-GNUmakefile | 48 |
1 files changed, 16 insertions, 32 deletions
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile index 2e95be9a6c88..4e7fb30ea3a7 100644 --- a/security/cryptopp/files/patch-GNUmakefile +++ b/security/cryptopp/files/patch-GNUmakefile @@ -1,40 +1,24 @@ ---- GNUmakefile.orig 2016-10-10 23:49:54 UTC +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 -@@ -41,7 +41,7 @@ SUNCC_511_OR_LATER := $(shell $(CXX) -V - SUNCC_512_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[2-9]|5\.[2-9]|6\.)") - SUNCC_513_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)") +@@ -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\.)") + # Enable shared object versioning for Linux -HAS_SOLIB_VERSION := $(IS_LINUX) +HAS_SOLIB_VERSION := 1 # Fixup SunOS ifeq ($(IS_SUN),1) -@@ -126,11 +126,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS - endif - - # Guard use of -march=native --ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) -- CXXFLAGS += -march=native --else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) -- CXXFLAGS += -march=native --else - # GCC 3.3 and "unknown option -march=" - # Ubuntu GCC 4.1 compiler crash with -march=native - # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" -@@ -140,7 +135,6 @@ else - else ifeq ($(SUN_COMPILER)$(IS_X86),01) - CXXFLAGS += -m32 - endif # X86/X32/X64 --endif - - # Aligned access required for -O3 and above due to vectorization - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) -@@ -404,7 +398,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) - # Full version suffix for shared library - SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) - # Different patchlevels are compatible, minor versions are not --SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) -+SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) - SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - endif # HAS_SOLIB_VERSION +@@ -957,7 +957,7 @@ libcryptopp.pc: + @echo 'Version: 7.0' >> 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 |