diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-04-23 13:41:00 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-04-23 13:44:22 -0700 |
| commit | f5a546c1e2816063003703969cd32de7513fae88 (patch) | |
| tree | 2b7d3ba46ed0ba6cc6c5192ca53d69346d76b000 /sys-cluster | |
| parent | sys-cluster/ceph: remove static-libs useflag (diff) | |
| download | gentoo-f5a546c1e2816063003703969cd32de7513fae88.tar.gz gentoo-f5a546c1e2816063003703969cd32de7513fae88.tar.bz2 gentoo-f5a546c1e2816063003703969cd32de7513fae88.zip | |
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@gentoo.org>
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/ceph/ceph-14.2.9-r1.ebuild | 8 |
1 files 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 fc084cb84975..795abd75b7c0 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)\\):" \ |