summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2021-03-08 20:04:33 +0100
committerMichał Górny <mgorny@gentoo.org>2021-03-11 09:47:57 +0100
commit4c42c36f5fdea8612cb824fbb6eeeeaed0719531 (patch)
treec66869cba8b23173d1357bd63b1d1726bf38a7e7 /eclass/distutils-r1.eclass
parentdistutils-r1.eclass: Use a common distutils-r1_python_test (diff)
downloadgentoo-4c42c36f5fdea8612cb824fbb6eeeeaed0719531.tar.gz
gentoo-4c42c36f5fdea8612cb824fbb6eeeeaed0719531.tar.bz2
gentoo-4c42c36f5fdea8612cb824fbb6eeeeaed0719531.zip
distutils-r1.eclass: Use underscores in .pydistutils.cfg keys
Switch to using underscore instead of hyphens in .pydistutils.cfg keys. The latter form is now deprecated by setuptools, while both seem to work fine with plain distutils. Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/distutils-r1.eclass')
-rw-r--r--eclass/distutils-r1.eclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 0e543412f645..4f21cfd9e4ca 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -673,7 +673,7 @@ distutils-r1_python_configure() {
_distutils-r1_create_setup_cfg() {
cat > "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
[build]
- build-base = ${BUILD_DIR}
+ build_base = ${BUILD_DIR}
# using a single directory for them helps us export
# ${PYTHONPATH} and ebuilds find the sources independently
@@ -682,16 +682,16 @@ _distutils-r1_create_setup_cfg() {
# note: due to some packages (wxpython) relying on separate
# platlib & purelib dirs, we do not set --build-lib (which
# can not be overridden with --build-*lib)
- build-platlib = %(build-base)s/lib
- build-purelib = %(build-base)s/lib
+ build_platlib = %(build_base)s/lib
+ build_purelib = %(build_base)s/lib
# make the ebuild writer lives easier
- build-scripts = %(build-base)s/scripts
+ build_scripts = %(build_base)s/scripts
# this is needed by distutils_install_for_testing since
# setuptools like to create .egg files for install --home.
[bdist_egg]
- dist-dir = ${BUILD_DIR}/dist
+ dist_dir = ${BUILD_DIR}/dist
_EOF_
# we can't refer to ${D} before src_install()
@@ -708,7 +708,7 @@ _distutils-r1_create_setup_cfg() {
if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
cat >> "${HOME}"/.pydistutils.cfg <<-_EOF_ || die
- install-scripts = $(python_get_scriptdir)
+ install_scripts = $(python_get_scriptdir)
_EOF_
fi
fi