From deadea403d4daed7cea66e067c9ada89f5a77298 Mon Sep 17 00:00:00 2001
From: Leorize <alaviss@users.noreply.github.com>
Date: Fri, 15 Dec 2017 07:21:25 +0700
Subject: [PATCH] dev-libs/crypto++: fixes

fixed secondary arch

added debug package

install pkg-config file

install & build versioned version of the library
---
 dev-libs/crypto++/crypto++-5.6.5.recipe       | 40 ++++++++++++++-----
 .../crypto++/patches/crypto++-5.6.5.patchset  | 25 ++++++++++++
 2 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 dev-libs/crypto++/patches/crypto++-5.6.5.patchset

diff --git a/dev-libs/crypto++/crypto++-5.6.5.recipe b/dev-libs/crypto++/crypto++-5.6.5.recipe
index bf8333904..89c594033 100644
--- a/dev-libs/crypto++/crypto++-5.6.5.recipe
+++ b/dev-libs/crypto++/crypto++-5.6.5.recipe
@@ -14,20 +14,25 @@ The library contains the following algorithms:
 * Elliptic curve cryptography: ECDSA, ECNR, ECIES, ECDH, ECMQV
 * Insecure or obsolescent algorithms: MD2, MD4, MD5
 * And many more other algorithms."
-HOMEPAGE="https://cryptopp.com"
+HOMEPAGE="https://cryptopp.com/"
 COPYRIGHT="2015-2017 Wei Dai"
 LICENSE="Boost v1.0"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://www.cryptopp.com/cryptopp565.zip"
 CHECKSUM_SHA256="a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34"
 SOURCE_DIR=""
+# Upstream patch, might be obsolete in a later version
+PATCHES="crypto++-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion=$portVersion
+libVersionCompat="$libVersion compat >= ${libVersion%.*}"
+
 PROVIDES="
 	crypto++$secondaryArchSuffix = $portVersion
-	lib:libcryptopp$secondaryArchSuffix = $portVersion compat >= $portVersion
+	lib:libcryptopp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -35,7 +40,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	crypto++${secondaryArchSuffix}_devel = $portVersion
-	devel:libcryptopp$secondaryArchSuffix = $portVersion compat >= $portVersion
+	devel:libcryptopp$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	crypto++$secondaryArchSuffix == $portVersion base
@@ -48,24 +53,39 @@ BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld
 	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
 	cmd:nasm
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage crypto++$secondaryArchSuffix \
+	$libDir/libcryptopp.so.$libVersion
+
 BUILD()
 {
-	make shared dynamic static $jobArgs
+	make HAS_SOLIB_VERSION=1 dynamic static $jobArgs
 }
 
 INSTALL()
 {
-	make install PREFIX=$prefix INCLUDEDIR=$includeDir
-
-	mv $libDir/libcryptopp.so $libDir/libcryptopp.so.$portVersion
-	ln -s $libDir/libcryptopp.so.$portVersion $libDir/libcryptopp.so
+	make \
+		HAS_SOLIB_VERSION=1 LDCONF=true \
+		BINDIR=$binDir LIBDIR=$libDir \
+		DATADIR=$dataDir INCLUDEDIR=$includeDir \
+		install
 
+	# Yes, they created the link. But they forgot to install it...
+	ln -s libcryptopp.so.$libVersion \
+		$libDir/libcryptopp.so.${libVersionCompat##* }
 	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
+
 	packageEntries devel \
 		$relativeDevelopDir
 }
diff --git a/dev-libs/crypto++/patches/crypto++-5.6.5.patchset b/dev-libs/crypto++/patches/crypto++-5.6.5.patchset
new file mode 100644
index 000000000..8bcf316b1
--- /dev/null
+++ b/dev-libs/crypto++/patches/crypto++-5.6.5.patchset
@@ -0,0 +1,25 @@
+From ec1e84e8ecefb81f7a233f047c75446eee9dfb54 Mon Sep 17 00:00:00 2001
+From: Leorize <alaviss@users.noreply.github.com>
+Date: Sat, 16 Dec 2017 15:06:42 +0700
+Subject: Makefile: fix architecture detection
+
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 2a0ff4c..ddd5422 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -15,9 +15,9 @@ LN ?= ln -sf
+ LDCONF ?= /sbin/ldconfig -n
+ UNAME := $(shell uname)
+ 
+-IS_X86 := $(shell uname -m | $(EGREP) -v "x86_64" | $(EGREP) -i -c "i.86|x86|i86")
++IS_X86 := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(EGREP) -v "64" | $(EGREP) -i -c "i.86|x86|i86")
+ IS_X32 ?= 0
+-IS_X64 := $(shell uname -m | $(EGREP) -i -c "(_64|d64)")
++IS_X64 := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(EGREP) -i -c "(_64|d64)")
+ IS_PPC := $(shell uname -m | $(EGREP) -i -c "ppc|power")
+ IS_ARM32 := $(shell uname -m | $(EGREP) -i -c "arm")
+ IS_ARM64 := $(shell uname -m | $(EGREP) -i -c "aarch64")
+-- 
+2.15.0
+