From 450469a99128876d7e004aa0d138308061c2d644 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Oct 2019 13:43:34 +0200 Subject: [PATCH] crypto++: readd musl soname linking patch otherwise the libcryptopp.so.8 symlink would be missing also use Makefile generated .pc --- srcpkgs/crypto++/files/libcrypto++.pc | 11 ---------- .../crypto++/patches/musl-soname-links.patch | 22 +++++++++++++++++++ srcpkgs/crypto++/template | 10 ++++----- 3 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/crypto++/files/libcrypto++.pc create mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch diff --git a/srcpkgs/crypto++/files/libcrypto++.pc b/srcpkgs/crypto++/files/libcrypto++.pc deleted file mode 100644 index 3f5d755951d..00000000000 --- a/srcpkgs/crypto++/files/libcrypto++.pc +++ /dev/null @@ -1,11 +0,0 @@ -# Written by Alexander Rødseth - -prefix=/usr -libdir=${prefix}/lib -includedir=${prefix}/include - -Name: libcrypto++-@@VERSION@@ -Description: Class library of cryptographic schemes -Version: @@VERSION@@ -Libs: -L${libdir} -lcryptopp -Cflags: -I${includedir} diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch new file mode 100644 index 00000000000..4d9b37e4c63 --- /dev/null +++ b/srcpkgs/crypto++/patches/musl-soname-links.patch @@ -0,0 +1,22 @@ +--- GNUmakefile 2019-10-20 13:33:45.272028979 +0200 ++++ - 2019-10-20 13:37:32.987528589 +0200 +@@ -1256,7 +1256,7 @@ + $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) + ifeq ($(HAS_SOLIB_VERSION),1) + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so +- $(LDCONF) $(DESTDIR)$(LIBDIR) ++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + endif + endif + ifneq ($(wildcard libcryptopp.pc),) +--- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200 ++++ - 2019-10-20 13:38:49.796656638 +0200 +@@ -732,7 +732,7 @@ + $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) + ifeq ($(HAS_SOLIB_VERSION),1) + -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so +- $(LDCONF) $(DESTDIR)$(LIBDIR) ++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + endif + endif + ifneq ($(wildcard libcryptopp.pc),) diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index 9fc17a0d4fd..d56e7ff2c20 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -1,10 +1,12 @@ # Template file for 'crypto++' pkgname=crypto++ version=820 -revision=1 +revision=2 create_wrksrc=yes build_style=gnu-makefile -make_build_target="libcryptopp.so libcryptopp.a" +make_build_args="PREFIX=/usr" +make_build_target="dynamic static libcryptopp.pc" +make_install_target="install-lib" hostmakedepends="unzip" short_desc="Free C++ class library of cryptographic schemes" maintainer="Orphaned " @@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 CXXFLAGS="-DNDEBUG -fPIC" if [ "$XBPS_CROSS" ]; then - make_build_args="-f GNUmakefile-cross" + make_build_args+=" -f GNUmakefile-cross" fi post_extract() { sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile } post_install() { - vinstall ${FILESDIR}/libcrypto++.pc 644 usr/lib/pkgconfig - sed -e "s,@@VERSION@@,${version},g" -i ${DESTDIR}/usr/lib/pkgconfig/libcrypto++.pc vlicense License.txt LICENSE }