commit: d1542c922ef3e2f1588a1bf3ab6cb8716dbacef0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Feb 8 13:50:07 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 8 14:53:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1542c92
dev-libs/crypto++: fix musl build Closes: https://bugs.gentoo.org/762997 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/crypto++/crypto++-8.2.0-r2.ebuild | 3 ++- dev-libs/crypto++/crypto++-8.4.0.ebuild | 4 ++++ .../files/crypto++-8.2.0-musl-ldconfig.patch | 24 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild index 1ffe175e83b..a52ee90857e 100644 --- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild +++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,6 +20,7 @@ S="${WORKDIR}" PATCHES=( "${FILESDIR}/${P}-build.patch" + "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch" ) config_add() { diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild index c28c2e43f1c..ed056d9020c 100644 --- a/dev-libs/crypto++/crypto++-8.4.0.ebuild +++ b/dev-libs/crypto++/crypto++-8.4.0.ebuild @@ -17,6 +17,10 @@ IUSE="+asm static-libs" BDEPEND="app-arch/unzip" +PATCHES=( + "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch" +) + config_uncomment() { sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die } diff --git a/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch new file mode 100644 index 00000000000..2ae8d287e12 --- /dev/null +++ b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch @@ -0,0 +1,24 @@ +https://github.com/void-ppc/void-packages/blob/master/srcpkgs/crypto++/patches/musl-soname-links.patch +https://bugs.gentoo.org/762997 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -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),) +--- a/GNUmakefile-cross ++++ b/GNUmakefile-cross +@@ -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),)
