moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

common/environment/setup/python.sh: update to Python 3.8.

Browse source
This commit is contained in:
Leah Neukirchen 2019-10-16 16:42:15 +02:00
parent 1e5a5e32ac
commit 915fe2de9f
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/build-style/python-module.sh
View file

@ -4,7 +4,7 @@
do_build() { do_build() {
: ${python_versions:="2.7 $py3_ver"} : ${python_versions:="2.7 $py3_ver"}
local pyver= pysufx= tmp_cflags="$CFLAGS" tmp_ldflags="$LDFLAGS" local pyver= tmp_cflags="$CFLAGS" tmp_ldflags="$LDFLAGS"
for pyver in $python_versions; do for pyver in $python_versions; do
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
@ -12,10 +12,7 @@ do_build() {
LDFLAGS="$tmp_ldflags" LDFLAGS="$tmp_ldflags"
PYPREFIX="$XBPS_CROSS_BASE" PYPREFIX="$XBPS_CROSS_BASE"
if [ "$pyver" != "2.7" ]; then CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
pysufx=m
fi
CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver}${pysufx} -I${XBPS_CROSS_BASE}/usr/include"
LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib" LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
LDSHARED="${CC} -shared $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS"
@ -49,15 +46,12 @@ do_check() {
do_install() { do_install() {
: ${python_versions:="2.7 $py3_ver"} : ${python_versions:="2.7 $py3_ver"}
local pyver= pysufx= local pyver=
for pyver in $python_versions; do for pyver in $python_versions; do
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
PYPREFIX="$XBPS_CROSS_BASE" PYPREFIX="$XBPS_CROSS_BASE"
if [ "$pyver" != "2.7" ]; then CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
pysufx=m
fi
CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver}${pysufx} -I${XBPS_CROSS_BASE}/usr/include"
LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib" LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
LDSHARED="${CC} -shared $LDFLAGS" LDSHARED="${CC} -shared $LDFLAGS"

4
common/environment/setup/python.sh
View file

@ -10,8 +10,8 @@ py2_lib="/usr/lib/python${py2_ver}"
py2_sitelib="${py2_lib}/site-packages" py2_sitelib="${py2_lib}/site-packages"
py2_inc="/usr/include/python${py2_ver}" py2_inc="/usr/include/python${py2_ver}"
py3_ver="3.6" py3_ver="3.8"
py3_abiver="m" py3_abiver=""
py3_lib="/usr/lib/python${py3_ver}" py3_lib="/usr/lib/python${py3_ver}"
py3_sitelib="${py3_lib}/site-packages" py3_sitelib="${py3_lib}/site-packages"
py3_inc="/usr/include/python${py3_ver}${py3_abiver}" py3_inc="/usr/include/python${py3_ver}${py3_abiver}"