From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 466321382C5 for ; Mon, 8 Feb 2021 14:54:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68043E090F; Mon, 8 Feb 2021 14:54:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 231E6E0908 for ; Mon, 8 Feb 2021 14:54:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C97AE340CD9 for ; Mon, 8 Feb 2021 14:54:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 423A254 for ; Mon, 8 Feb 2021 14:54:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1612796038.d1542c922ef3e2f1588a1bf3ab6cb8716dbacef0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/crypto++/, dev-libs/crypto++/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/crypto++/crypto++-8.2.0-r2.ebuild dev-libs/crypto++/crypto++-8.4.0.ebuild dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch X-VCS-Directories: dev-libs/crypto++/ dev-libs/crypto++/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d1542c922ef3e2f1588a1bf3ab6cb8716dbacef0 X-VCS-Branch: master Date: Mon, 8 Feb 2021 14:54:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac27a23e-ed1e-48f3-94a0-0c34997dc023 X-Archives-Hash: cc13cdbbdd12e47c7649636d7d926023 commit: d1542c922ef3e2f1588a1bf3ab6cb8716dbacef0 Author: Sam James gentoo org> AuthorDate: Mon Feb 8 13:50:07 2021 +0000 Commit: Sam James gentoo 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 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),)