1 |
commit: f5a546c1e2816063003703969cd32de7513fae88 |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Thu Apr 23 20:41:00 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 23 20:44:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a546c1 |
7 |
|
8 |
sys-cluster/ceph-14.2.9-r1: Remove patch to change boost sonames |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
sys-cluster/ceph/ceph-14.2.9-r1.ebuild | 8 +++----- |
15 |
1 file changed, 3 insertions(+), 5 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild |
18 |
index fc084cb8497..795abd75b7c 100644 |
19 |
--- a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild |
20 |
+++ b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild |
21 |
@@ -163,7 +163,7 @@ PATCHES=( |
22 |
"${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch" |
23 |
"${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" |
24 |
"${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" |
25 |
- "${FILESDIR}/ceph-14.2.0-link-crc32-Wstatically.patch" |
26 |
+ "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch" |
27 |
"${FILESDIR}/ceph-14.2.0-cython-0.29.patch" |
28 |
"${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" |
29 |
"${FILESDIR}/ceph-14.2.4-python-executable.patch" |
30 |
@@ -197,12 +197,10 @@ src_prepare() { |
31 |
cmake-utils_src_prepare |
32 |
|
33 |
if use system-boost; then |
34 |
- eapply "${FILESDIR}/ceph-14.2.8-boost-sonames.patch" |
35 |
- |
36 |
find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ |
37 |
| xargs --null sed \ |
38 |
- -e 's|Boost::|Boost_|g' \ |
39 |
- -e 's|Boost_boost|boost_system|g' -i || die |
40 |
+ -e 's|Boost::|boost_|g' \ |
41 |
+ -e 's|boost_boost|boost_system|g' -i || die |
42 |
fi |
43 |
|
44 |
sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ |