From 26a50d6b0771fda61233d18030f3577ae8b47f71 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 11 Dec 2021 11:17:03 +0100 Subject: [PATCH] crypto++: bump version --- ...o++-8.2.0.recipe => crypto++-8.6.0.recipe} | 21 +++++----- ...8.2.0.patchset => crypto++-8.6.0.patchset} | 38 +++++++++---------- 2 files changed, 28 insertions(+), 31 deletions(-) rename dev-libs/crypto++/{crypto++-8.2.0.recipe => crypto++-8.6.0.recipe} (86%) rename dev-libs/crypto++/patches/{crypto++-8.2.0.patchset => crypto++-8.6.0.patchset} (72%) diff --git a/dev-libs/crypto++/crypto++-8.2.0.recipe b/dev-libs/crypto++/crypto++-8.6.0.recipe similarity index 86% rename from dev-libs/crypto++/crypto++-8.2.0.recipe rename to dev-libs/crypto++/crypto++-8.6.0.recipe index 3ba6e6e89..2e71577d7 100644 --- a/dev-libs/crypto++/crypto++-8.2.0.recipe +++ b/dev-libs/crypto++/crypto++-8.6.0.recipe @@ -19,8 +19,8 @@ COPYRIGHT="2015-2019 Wei Dai" LICENSE="Boost v1.0" REVISION="1" SOURCE_URI="https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${portVersion//./_}.tar.gz" -CHECKSUM_SHA256="e3bcd48a62739ad179ad8064b523346abb53767bcbefc01fe37303412292343e" -PATCHES="crypto++-8.2.0.patchset" +CHECKSUM_SHA256="9304625f4767a13e0a5f26d0f019d78cf9375604a33e5391c3bf2e81399dfeb8" +PATCHES="crypto++-$portVersion.patchset" SOURCE_DIR="cryptopp-CRYPTOPP_${portVersion//./_}" ARCHITECTURES="all !x86_gcc2" @@ -61,7 +61,7 @@ defineDebugInfoPackage crypto++$secondaryArchSuffix \ BUILD() { - make all $jobArgs + make $jobArgs dynamic cryptest.exe libcryptopp.pc } INSTALL() @@ -72,19 +72,16 @@ INSTALL() LIBDIR=$libDir \ DATADIR=$dataDir \ INCLUDEDIR=$includeDir \ - install-lib + install + + rm -f $libDir/lib*.a prepareInstalledDevelLib libcryptopp - - install -d -m 755 $developLibDir/pkgconfig - cat > $developLibDir/pkgconfig/libcrypto++.pc << EOF -Name: libcrypto++ -Description: Class library of cryptographic schemes -Version: $portVersion -Libs: -lcryptopp -EOF + fixPkgconfig packageEntries devel $developDir + + rm -rf "$binDir" "$dataDir/cryptopp" } TEST() diff --git a/dev-libs/crypto++/patches/crypto++-8.2.0.patchset b/dev-libs/crypto++/patches/crypto++-8.6.0.patchset similarity index 72% rename from dev-libs/crypto++/patches/crypto++-8.2.0.patchset rename to dev-libs/crypto++/patches/crypto++-8.6.0.patchset index 4e9547995..04f8e1702 100644 --- a/dev-libs/crypto++/patches/crypto++-8.2.0.patchset +++ b/dev-libs/crypto++/patches/crypto++-8.6.0.patchset @@ -1,14 +1,14 @@ -From 24f6ed849feb13be03236c9bfbd42daca77f258a Mon Sep 17 00:00:00 2001 +From 4b527c220bc3afc441cb14920d589d2d36d0d366 Mon Sep 17 00:00:00 2001 From: kikadf Date: Fri, 31 May 2019 16:04:29 +0200 Subject: crypto++: add Haiku patchset diff --git a/GNUmakefile b/GNUmakefile -index e7b7b3a..6123fd8 100755 +index 6f63071..dac3861 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -65,6 +65,7 @@ IS_DARWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Darwin") +@@ -79,6 +79,7 @@ IS_DARWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Darwin") IS_NETBSD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "NetBSD") IS_AIX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "aix") IS_SUN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "SunOS|Solaris") @@ -16,7 +16,7 @@ index e7b7b3a..6123fd8 100755 SUN_COMPILER := $(shell $(CXX) -V 2>&1 | $(GREP) -i -c -E 'CC: (Sun|Studio)') GCC_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -v -E '(llvm|clang)' | $(GREP) -i -c -E '(gcc|g\+\+)') -@@ -83,7 +84,7 @@ endif +@@ -88,7 +89,7 @@ INTEL_COMPILER := $(shell $(CXX) --version 2>/dev/null | $(GREP) -i -c '\(icc\)' # Enable shared object versioning for Linux and Solaris HAS_SOLIB_VERSION ?= 0 @@ -25,7 +25,7 @@ index e7b7b3a..6123fd8 100755 HAS_SOLIB_VERSION := 1 endif -@@ -1006,7 +1007,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) +@@ -1125,7 +1126,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) # Different patchlevels and minors are compatible since 6.1 SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) # Linux uses -Wl,-soname @@ -35,21 +35,21 @@ index e7b7b3a..6123fd8 100755 SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) -- -2.21.0 +2.30.2 -From 50bd4a3d094758251a53fc87629dfb732b3bb5c9 Mon Sep 17 00:00:00 2001 +From de813189dc0ff734523d9c8c19701ec79ceb88c8 Mon Sep 17 00:00:00 2001 From: kikadf Date: Sat, 1 Jun 2019 09:38:34 +0200 Subject: crypto++: Fix linking of lib diff --git a/GNUmakefile b/GNUmakefile -index 6123fd8..99a5dc0 100755 +index dac3861..ab96c61 100644 --- a/GNUmakefile +++ b/GNUmakefile -@@ -1257,6 +1257,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) - $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) +@@ -1413,6 +1413,7 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),) + $(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) ifeq ($(HAS_SOLIB_VERSION),1) -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) @@ -57,28 +57,28 @@ index 6123fd8..99a5dc0 100755 endif endif -- -2.21.0 +2.30.2 -From e6f17eefec2ebcb51b5c791db1baa1cdc2d6bb60 Mon Sep 17 00:00:00 2001 +From 225e0880448624bf1c500b29d4027ea350ceaa0c Mon Sep 17 00:00:00 2001 From: kikadf Date: Fri, 7 Jun 2019 15:00:26 +0200 Subject: Haiku fix 2 config.h -diff --git a/config.h b/config.h -index 283c409..60573ad 100644 ---- a/config.h -+++ b/config.h -@@ -928,7 +928,7 @@ NAMESPACE_END - #define CRYPTOPP_WIN32_AVAILABLE +diff --git a/config_os.h b/config_os.h +index 107e445..c54d4c9 100644 +--- a/config_os.h ++++ b/config_os.h +@@ -40,7 +40,7 @@ #endif + // Unix and Linux platforms -#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) +#if defined(__unix__) || defined(__MACH__) || defined(__NetBSD__) || defined(__sun) || defined(__HAIKU__) #define CRYPTOPP_UNIX_AVAILABLE #endif -- -2.21.0 +2.30.2