wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

crypto++: readd musl soname linking patch

Browse source 
otherwise the libcryptopp.so.8 symlink would be missing
also use Makefile generated .pc
This commit is contained in:
John 2019-10-20 13:43:34 +02:00 • committed by John Zimmermann
parent 6c8235f7a6
commit 00929e8c45
3 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/crypto++/files/libcrypto++.pc
View file

@ -1,11 +0,0 @@
# Written by Alexander Rødseth <rodseth@gmail.com>
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}

22
srcpkgs/crypto++/patches/musl-soname-links.patch Normal file
View file

@ -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),)

10
srcpkgs/crypto++/template
View file

@ -1,10 +1,12 @@
# Template file for 'crypto++' # Template file for 'crypto++'
pkgname=crypto++ pkgname=crypto++
version=820 version=820
revision=1 revision=2
create_wrksrc=yes create_wrksrc=yes
build_style=gnu-makefile 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" hostmakedepends="unzip"
short_desc="Free C++ class library of cryptographic schemes" short_desc="Free C++ class library of cryptographic schemes"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
@ -16,15 +18,13 @@ checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058
CXXFLAGS="-DNDEBUG -fPIC" CXXFLAGS="-DNDEBUG -fPIC"
if [ "$XBPS_CROSS" ]; then if [ "$XBPS_CROSS" ]; then
make_build_args="-f GNUmakefile-cross" make_build_args+=" -f GNUmakefile-cross"
fi fi
post_extract() { post_extract() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
} }
post_install() { 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 vlicense License.txt LICENSE
} }