wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-01 18:32:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

python: update to 2.7.12

Browse source
This commit is contained in:
Alessio Sergi 2016-06-30 12:00:12 +02:00
parent bf69578407
commit da861e3c56
5 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
srcpkgs/python-tkinter/files/Python-2.7.6-xcompile.patch
View file

@ -1 +0,0 @@
../../python/files/Python-2.7.6-xcompile.patch

1
srcpkgs/python-tkinter/files/cross.patch Symbolic link
View file

@ -0,0 +1 @@
../../python/files/cross.patch

18
srcpkgs/python-tkinter/template
View file

@ -4,8 +4,8 @@
# A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python # A CYCLIC DEPENDENCY: python -> tk -> libX11 -> libxcb -> xcb-proto -> python
# #
pkgname=python-tkinter pkgname=python-tkinter
version=2.7.11 version=2.7.12
revision=2 revision=1
wrksrc="Python-${version}" wrksrc="Python-${version}"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends=" makedepends="
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.python.org" homepage="http://www.python.org"
license="PSF" license="PSF"
distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz"
checksum=962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 checksum=d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978
pre_configure() { pre_configure() {
# Ensure that internal copies of expat, libffi and zlib are not used. # Ensure that internal copies of expat, libffi and zlib are not used.
@ -36,19 +36,15 @@ do_configure() {
mkdir -p ../hostpython mkdir -p ../hostpython
mv python ../hostpython mv python ../hostpython
cd .. cd ..
patch -Np0 -i ${FILESDIR}/Python-2.7.6-xcompile.patch patch -Np0 -i ${FILESDIR}/cross.patch
fi fi
./configure ${configure_args} \ ./configure ${configure_args} \
--with-threads --enable-ipv6 --with-signal-module \ --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
--with-system-ffi --enable-unicode=ucs4 --with-system-expat \ --with-computed-gotos --with-wctype-functions --with-system-expat \
--with-wctype-functions --enable-shared \ --with-system-ffi --without-ensurepip
ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes \
ac_cv_have_long_long_format=yes
} }
do_build() { do_build() {
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c
export PATH="$PATH:$wrksrc/hostpython" export PATH="$PATH:$wrksrc/hostpython"
make ${makejobs} make ${makejobs}
} }

17
srcpkgs/python/files/Python-2.7.6-xcompile.patch → srcpkgs/python/files/cross.patch
View file

@ -1,22 +1,5 @@
--- Makefile.pre.in --- Makefile.pre.in
+++ Makefile.pre.in +++ Makefile.pre.in
@@ -227,6 +227,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@
##########################################################################
# Parser
PGEN= Parser/pgen$(EXE)
+PGEN= Parser/pgen$(EXE)
PSRCS= \
Parser/acceler.c \
@@ -593,7 +595,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule
$(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
@$(MKDIR_P) Include
$(MAKE) $(PGEN)
- $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
+ $(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
$(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
$(MAKE) $(GRAMMAR_H)
touch $(GRAMMAR_C)
@@ -1000,12 +1002,12 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c @@ -1000,12 +1002,12 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \

16
srcpkgs/python/template
View file

@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter". # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter".
# #
pkgname=python pkgname=python
version=2.7.11 version=2.7.12
revision=9 revision=1
wrksrc="Python-${version}" wrksrc="Python-${version}"
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends=" makedepends="
@ -17,7 +17,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.python.org" homepage="http://www.python.org"
license="PSF" license="PSF"
distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz" distfiles="http://www.python.org/ftp/python/$version/Python-$version.tar.xz"
checksum=962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46 checksum=d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978
alternatives=" alternatives="
python:idle:/usr/bin/idle2.7 python:idle:/usr/bin/idle2.7
@ -44,18 +44,16 @@ do_configure() {
mkdir -p ../hostpython mkdir -p ../hostpython
mv python ../hostpython mv python ../hostpython
cd .. cd ..
patch -Np0 -i ${FILESDIR}/Python-2.7.6-xcompile.patch patch -Np0 -i ${FILESDIR}/cross.patch
_args="--build=${XBPS_MACHINE%%-musl}" _args="--build=${XBPS_MACHINE%%-musl}"
fi fi
./configure ${configure_args} ${_args} \ ./configure ${configure_args} ${_args} \
--with-threads --enable-ipv6 --with-signal-module \ --enable-shared --enable-ipv6 --with-threads --enable-unicode=ucs4 \
--with-system-ffi --enable-unicode=ucs4 --with-system-expat \ --with-computed-gotos --with-wctype-functions --with-system-expat \
--with-wctype-functions --enable-shared --with-system-ffi --without-ensurepip
} }
do_build() { do_build() {
# Avoid invoking pgen for cross-compiles.
touch Include/graminit.h Python/graminit.c
export PATH="$PATH:$wrksrc/hostpython" export PATH="$PATH:$wrksrc/hostpython"
make ${makejobs} make ${makejobs}
} }