build-style/python{2,3}-module: do not use custom build directory
There is no need to use a custom build directory for python{2,3}-only modules. This indirectly fixes our issues with packages that use distutils-extra.
This commit is contained in:
parent
56941b2e99
commit
8742e48972
2 changed files with 6 additions and 12 deletions
common/build-style
|
@ -11,10 +11,9 @@ do_build() {
|
||||||
LDSHARED="${CC} -shared $LDFLAGS"
|
LDSHARED="${CC} -shared $LDFLAGS"
|
||||||
env CC="$CC" LDSHARED="$LDSHARED" \
|
env CC="$CC" LDSHARED="$LDSHARED" \
|
||||||
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
||||||
LDFLAGS="$LDFLAGS" python2 setup.py \
|
LDFLAGS="$LDFLAGS" python2 setup.py build ${make_build_args}
|
||||||
build --build-base=build-${py2_ver} ${make_build_args}
|
|
||||||
else
|
else
|
||||||
python2 setup.py build --build-base=build-${py2_ver} ${make_build_args}
|
python2 setup.py build ${make_build_args}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,10 +27,8 @@ do_install() {
|
||||||
env CC="$CC" LDSHARED="$LDSHARED" \
|
env CC="$CC" LDSHARED="$LDSHARED" \
|
||||||
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
||||||
LDFLAGS="$LDFLAGS" python2 setup.py \
|
LDFLAGS="$LDFLAGS" python2 setup.py \
|
||||||
build --build-base=build-${py2_ver} \
|
|
||||||
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
||||||
else
|
else
|
||||||
python2 setup.py build --build-base=build-${py2_ver} \
|
python2 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
||||||
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,10 +11,9 @@ do_build() {
|
||||||
LDSHARED="${CC} -shared $LDFLAGS"
|
LDSHARED="${CC} -shared $LDFLAGS"
|
||||||
env CC="$CC" LDSHARED="$LDSHARED" \
|
env CC="$CC" LDSHARED="$LDSHARED" \
|
||||||
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
||||||
LDFLAGS="$LDFLAGS" python3 setup.py \
|
LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args}
|
||||||
build --build-base=build-${py3_ver} ${make_build_args}
|
|
||||||
else
|
else
|
||||||
python3 setup.py build --build-base=build-${py3_ver} ${make_build_args}
|
python3 setup.py build ${make_build_args}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,10 +27,8 @@ do_install() {
|
||||||
env CC="$CC" LDSHARED="$LDSHARED" \
|
env CC="$CC" LDSHARED="$LDSHARED" \
|
||||||
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
|
||||||
LDFLAGS="$LDFLAGS" python3 setup.py \
|
LDFLAGS="$LDFLAGS" python3 setup.py \
|
||||||
build --build-base=build-${py3_ver} \
|
|
||||||
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
||||||
else
|
else
|
||||||
python3 setup.py build --build-base=build-${py3_ver} \
|
python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
||||||
install --prefix=/usr --root=${DESTDIR} ${make_install_args}
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue