diff options
Diffstat (limited to 'security/cryptopp/files')
| -rw-r--r-- | security/cryptopp/files/patch-GNUmakefile | 22 | ||||
| -rw-r--r-- | security/cryptopp/files/patch-misc.h | 8 |
2 files changed, 10 insertions, 20 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 diff --git a/security/cryptopp/files/patch-misc.h b/security/cryptopp/files/patch-misc.h index 165720d6bef7..7d923019af27 100644 --- a/security/cryptopp/files/patch-misc.h +++ b/security/cryptopp/files/patch-misc.h @@ -2,9 +2,9 @@ This fixes a warning triggered by testing an unsigned parameter against 0. The patch solves this by creating a different template for signed case. (PR: 178827) ---- misc.h.orig 2021-01-01 17:03:59 UTC +--- misc.h.orig 2022-08-07 19:52:03 UTC +++ misc.h -@@ -700,8 +700,10 @@ inline bool SafeConvert(T1 from, T2 &to) +@@ -720,8 +720,10 @@ inline bool SafeConvert(T1 from, T2 &to) /// \param value the value to convert /// \param base the base to use during the conversion /// \return the string representation of value in base. @@ -16,7 +16,7 @@ for signed case. (PR: 178827) { // Hack... set the high bit for uppercase. const unsigned int HIGH_BIT = (1U << 31); -@@ -712,12 +714,6 @@ std::string IntToString(T value, unsigned int base = 1 +@@ -732,12 +734,6 @@ std::string IntToString(T value, unsigned int base = 1 if (value == 0) return "0"; @@ -29,7 +29,7 @@ for signed case. (PR: 178827) std::string result; while (value > 0) { -@@ -725,9 +721,28 @@ std::string IntToString(T value, unsigned int base = 1 +@@ -745,9 +741,28 @@ std::string IntToString(T value, unsigned int base = 1 result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result; value /= base; } |