ghopp
/
ghopp-overlay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1 Commits
cda6558c8d ... a45fb8c8c0

Author SHA1 Message Date
Georg Hopp a45fb8c8c0
Try to fix python deps
4 years ago
2 changed files with 6 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 2
      sys-cluster/ceph/Manifest
  2. 22
      sys-cluster/ceph/ceph-10.2.10-r4.ebuild

2
sys-cluster/ceph/Manifest
View File

@ -109,5 +109,5 @@ AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd
AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a AUX sysctld 57 BLAKE2B 840eec3d188df4998c7ba8fb923777636ae9d2aa342545b69c12e5ea8aa98ae97349b42b56c65a531b207c5f970f873a79c41789941cdd10b279e38f1616f84d SHA512 410f5d721c6cfcc5d7ddaff4f348345140d4b8e1b8fddccb537118bfc59f573ecad63db448598423c9a58fcfdb4cef90e6af27b838e6b77955dfd47673f0f52a
DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537 DIST ceph-10.2.10.tar.gz 14573701 BLAKE2B 78c68deb8537cae8394b4d35569983431e938eff42b01f448dea68016b33ca5770c83d1e1d382bfd6c8164d5259e821779c6515f8c8fb4d5d52ee90b7df43180 SHA512 883d1b8340aaefc7a1eee4bbfb5b1d1cc15bffed8f35fb1e8fb86b1208a4d0d16753eb6c688ea0e661c4877d3d148b2b6c2b41620c4e8a61e47c69f46f98e537
EBUILD ceph-10.2.10-r3.ebuild 7889 BLAKE2B 480a004d504c825de64784f9d333d904c79b6a4529e2f4823a478cda97e382084191bf2c0fee8eb8be05780ea02a99584f84f1addf4802f6ed2f925758571d8f SHA512 20de80cb781a852541f51f1528a0b0a6647f5d4452522f91f4ed5707fcd87d4c70249223dff04a8ce63e10a717c499ff63b3e4daf9eef6d22752742e5d599bba EBUILD ceph-10.2.10-r3.ebuild 7889 BLAKE2B 480a004d504c825de64784f9d333d904c79b6a4529e2f4823a478cda97e382084191bf2c0fee8eb8be05780ea02a99584f84f1addf4802f6ed2f925758571d8f SHA512 20de80cb781a852541f51f1528a0b0a6647f5d4452522f91f4ed5707fcd87d4c70249223dff04a8ce63e10a717c499ff63b3e4daf9eef6d22752742e5d599bba
EBUILD ceph-10.2.10-r4.ebuild 7880 BLAKE2B 6b7cd1f66655cde5982acb15b4d85f4bd823f9bd5e244a9e94e28481b2c621191a4217a11d3500596231b482835d2e2ec8952754afacc06df09d02c4eca6ae92 SHA512 63dec3f997179ffbdcf806cf258d026123388dd03ede9c79701c865bde1706ed3021d30cbe3a14404e517b7ad10a7dadccc9d78b3c9ab474f884fa4f81cacb14
EBUILD ceph-10.2.10-r4.ebuild 7451 BLAKE2B 1df4a2a0da2460d9da9c4683d9aa48f6982941284781a1e9c5f5cd7588367b467091dd83d78f78f1db5a7b80b8b96d40ac694d9a0bebdaf6bae9c757a0de38d9 SHA512 2ae54227b0c7c11f4a84e3d7a3ea74637344d8cb08d1d26587b83ee3935d63c3a0da49f0497aafa4555036edb83435a54d374d4f14233db393b2a313290e6ea3
MISC metadata.xml 2044 BLAKE2B f9a309d38c66cfb87071206331a6e2ba88366ed09802e949cb4499f1a0b2ee7a3ceca7df5653d1955c76ad2daf900aeee166265a2ced9c0b393e609f397dd563 SHA512 c051bacbbc9e64f0774714c1f6f8cf99990e1669de0ca1633173d870c03e04827cae993fd5e6846b310d838eead8471d2181a0678693ea43423e08795dfc0a47 MISC metadata.xml 2044 BLAKE2B f9a309d38c66cfb87071206331a6e2ba88366ed09802e949cb4499f1a0b2ee7a3ceca7df5653d1955c76ad2daf900aeee166265a2ced9c0b393e609f397dd563 SHA512 c051bacbbc9e64f0774714c1f6f8cf99990e1669de0ca1633173d870c03e04827cae993fd5e6846b310d838eead8471d2181a0678693ea43423e08795dfc0a47

22
sys-cluster/ceph/ceph-10.2.10-r4.ebuild
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=6 EAPI=6
PYTHON_COMPAT=( python{2_7,3_{6..10}} )
PYTHON_COMPAT=( python3_{8..10} )
inherit check-reqs autotools eutils python-r1 udev user \ inherit check-reqs autotools eutils python-r1 udev user \
readme.gentoo-r1 systemd versionator flag-o-matic toolchain-funcs readme.gentoo-r1 systemd versionator flag-o-matic toolchain-funcs
@ -64,6 +64,7 @@ COMMON_DEPEND="
lttng? ( dev-util/lttng-ust:= ) lttng? ( dev-util/lttng-ust:= )
${PYTHON_DEPS} ${PYTHON_DEPS}
" "
BDEPEND="dev-lang/python:2.7"
DEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND}
dev-python/cython[${PYTHON_USEDEP}] dev-python/cython[${PYTHON_USEDEP}]
app-arch/cpio app-arch/cpio
@ -86,7 +87,7 @@ RDEPEND="${COMMON_DEPEND}
dev-python/requests[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}]
" "
REQUIRED_USE=" REQUIRED_USE="
$(python_gen_useflags 'python2*')
|| ( $(python_gen_useflags 'python3*') )
${PYTHON_REQUIRED_USE} ${PYTHON_REQUIRED_USE}
^^ ( nss cryptopp ) ^^ ( nss cryptopp )
?? ( jemalloc tcmalloc ) ?? ( jemalloc tcmalloc )
@ -152,18 +153,6 @@ emake_python_bindings() {
__emake_python_bindings_do_impl() { __emake_python_bindings_do_impl() {
ceph_run_econf "${EPYTHON}" ceph_run_econf "${EPYTHON}"
emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}" emake "${params[@]}" PYTHON="${EPYTHON}" "${binding}-pybind-${action}"
# these don't work and aren't needed on python3
if [[ ${EBUILD_PHASE} == install ]]; then
for module in "${S}"/src/pybind/*.py; do
module_basename="$(basename "${module}")"
if [[ ${module_basename} == ceph_volume_client.py ]] && ! use cephfs; then
continue
elif [[ ! -e "${ED}/$(python_get_sitedir)/${module_basename}" ]]; then
python_domodule ${module}
fi
done
fi
} }
pushd "${S}/src" pushd "${S}/src"
@ -233,8 +222,7 @@ src_configure() {
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
) )
# we can only use python2.7 for building at the moment
ceph_run_econf "python2*"
ceph_run_econf "python3*"
} }
ceph_run_econf() { ceph_run_econf() {
@ -298,7 +286,7 @@ src_install() {
readme.gentoo_create_doc readme.gentoo_create_doc
python_setup 'python2*'
python_setup 'python3*'
python_fix_shebang "${ED}"/usr/{,s}bin/ python_fix_shebang "${ED}"/usr/{,s}bin/
# python_fix_shebang apparently is not idempotent # python_fix_shebang apparently is not idempotent

Write Preview
Loading…
Cancel
Save