xbps-src: do not hardcode python3 version

This commit is contained in:
Alessio Sergi 2018-08-10 03:48:34 +02:00
parent d06c1d18a0
commit c46677f299
4 changed files with 6 additions and 7 deletions

View file

@ -19,9 +19,9 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=97dcc3169bd430270fc29adb65145846a58c1b55cdbb73382a4a89307bdad03c checksum=97dcc3169bd430270fc29adb65145846a58c1b55cdbb73382a4a89307bdad03c
if [ "${CROSS_BUILD}" ]; then if [ "${CROSS_BUILD}" ]; then
# Make python2.7 detection work in cross builds # Make python3.x detection work in cross builds
CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python3.6m" CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/python3.6m" CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
fi fi
# Package build options # Package build options
build_options="gdbserver static python" build_options="gdbserver static python"

View file

@ -9,8 +9,7 @@ makedepends="python3-devel qt5-devel knewstuff-devel kitemmodels-devel
threadweaver-devel ktexteditor-devel kcmutils-devel knotifyconfig-devel threadweaver-devel ktexteditor-devel kcmutils-devel knotifyconfig-devel
grantlee5-devel kdevelop-devel" grantlee5-devel kdevelop-devel"
pycompile_dirs="usr/share/kdevpythonsupport" pycompile_dirs="usr/share/kdevpythonsupport"
pycompile_version="3.6" pycompile_version="$py3_ver"
python_version="3"
short_desc="Python 3 language and Django project support for KDevelop" short_desc="Python 3 language and Django project support for KDevelop"
maintainer="yopito <pierre.bourgin@free.fr>" maintainer="yopito <pierre.bourgin@free.fr>"
license="LGPL-2" license="LGPL-2"

View file

@ -21,7 +21,7 @@ fi
do_build() { do_build() {
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
export CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python3.6m" export CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
sed -i "s|-fpie|-fpie ${CFLAGS}|g" setup.py sed -i "s|-fpie|-fpie ${CFLAGS}|g" setup.py
fi fi
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in

View file

@ -28,7 +28,7 @@ do_check() {
# Add variables that will be used by python to find the local # Add variables that will be used by python to find the local
# hypothesis build # hypothesis build
PY3PATH="${PWD}/build-3.6/lib" PY3PATH="${PWD}/build-${py3_ver}/lib"
PY2PATH="${PWD}/build-2.7/lib" PY2PATH="${PWD}/build-2.7/lib"
PYTHONPATH="${PY3PATH}" python3 -m pytest tests/cover PYTHONPATH="${PY3PATH}" python3 -m pytest tests/cover