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