| 1 |
commit: d1542c922ef3e2f1588a1bf3ab6cb8716dbacef0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 8 13:50:07 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 8 14:53:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1542c92 |
| 7 |
|
| 8 |
dev-libs/crypto++: fix musl build |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/762997 |
| 11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/crypto++/crypto++-8.2.0-r2.ebuild | 3 ++- |
| 15 |
dev-libs/crypto++/crypto++-8.4.0.ebuild | 4 ++++ |
| 16 |
.../files/crypto++-8.2.0-musl-ldconfig.patch | 24 ++++++++++++++++++++++ |
| 17 |
3 files changed, 30 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild |
| 20 |
index 1ffe175e83b..a52ee90857e 100644 |
| 21 |
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild |
| 22 |
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2020 Gentoo Authors |
| 25 |
+# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -20,6 +20,7 @@ S="${WORKDIR}" |
| 30 |
|
| 31 |
PATCHES=( |
| 32 |
"${FILESDIR}/${P}-build.patch" |
| 33 |
+ "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch" |
| 34 |
) |
| 35 |
|
| 36 |
config_add() { |
| 37 |
|
| 38 |
diff --git a/dev-libs/crypto++/crypto++-8.4.0.ebuild b/dev-libs/crypto++/crypto++-8.4.0.ebuild |
| 39 |
index c28c2e43f1c..ed056d9020c 100644 |
| 40 |
--- a/dev-libs/crypto++/crypto++-8.4.0.ebuild |
| 41 |
+++ b/dev-libs/crypto++/crypto++-8.4.0.ebuild |
| 42 |
@@ -17,6 +17,10 @@ IUSE="+asm static-libs" |
| 43 |
|
| 44 |
BDEPEND="app-arch/unzip" |
| 45 |
|
| 46 |
+PATCHES=( |
| 47 |
+ "${FILESDIR}/${PN}-8.2.0-musl-ldconfig.patch" |
| 48 |
+) |
| 49 |
+ |
| 50 |
config_uncomment() { |
| 51 |
sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die |
| 52 |
} |
| 53 |
|
| 54 |
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 |
| 55 |
new file mode 100644 |
| 56 |
index 00000000000..2ae8d287e12 |
| 57 |
--- /dev/null |
| 58 |
+++ b/dev-libs/crypto++/files/crypto++-8.2.0-musl-ldconfig.patch |
| 59 |
@@ -0,0 +1,24 @@ |
| 60 |
+https://github.com/void-ppc/void-packages/blob/master/srcpkgs/crypto++/patches/musl-soname-links.patch |
| 61 |
+https://bugs.gentoo.org/762997 |
| 62 |
+--- a/GNUmakefile |
| 63 |
++++ b/GNUmakefile |
| 64 |
+@@ -1256,7 +1256,7 @@ |
| 65 |
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) |
| 66 |
+ ifeq ($(HAS_SOLIB_VERSION),1) |
| 67 |
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so |
| 68 |
+- $(LDCONF) $(DESTDIR)$(LIBDIR) |
| 69 |
++ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) |
| 70 |
+ endif |
| 71 |
+ endif |
| 72 |
+ ifneq ($(wildcard libcryptopp.pc),) |
| 73 |
+--- a/GNUmakefile-cross |
| 74 |
++++ b/GNUmakefile-cross |
| 75 |
+@@ -732,7 +732,7 @@ |
| 76 |
+ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) |
| 77 |
+ ifeq ($(HAS_SOLIB_VERSION),1) |
| 78 |
+ -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so |
| 79 |
+- $(LDCONF) $(DESTDIR)$(LIBDIR) |
| 80 |
++ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) |
| 81 |
+ endif |
| 82 |
+ endif |
| 83 |
+ ifneq ($(wildcard libcryptopp.pc),) |
Archives