Updated to 3.4.2

This commit is contained in:
Denis Silakov 2014-10-09 22:26:28 +04:00
parent 1bfdf5ee31
commit bb940a1624
3 changed files with 6 additions and 93 deletions

View file

@ -4,6 +4,7 @@ removed_sources:
Python-3.3.2.tar.xz: 87009d0c156c6e1354dfec5c98c328cae93950ad
Python-3.3.3.tar.xz: af4e75a34bd538c79b9871227c2e7f56569ac107
Python-3.3.4.tar.xz: 2c9586eeb4b6e45e9ebc28372c0856c709d9a522
Python-3.4.1.tar.xz: 143e098efe7ee7bec8a4904ec4b322f28a067a03
python-3.3.0-docs-html.tar.bz2: 5299b1523ede931767199a5b13388a5bf35351d5
python-3.3.1-docs-html.tar.bz2: 55c3b3f3453346835b0df2b3b0ad7fe20833a7f7
python-3.3.2-docs-html.tar.bz2: 514e1a0810fa9e6433f4bc64bdc0ad407d49ebc5
@ -11,5 +12,6 @@ removed_sources:
python-3.3.4-docs-html.tar.bz2: 6d54aa11f2aa51339c09358d4a10217ee905dae3
python-3.4.0-docs-html.tar.bz2: d6e8f45219353b128f002f3a7311ec4e08c0ca49
sources:
Python-3.4.1.tar.xz: 143e098efe7ee7bec8a4904ec4b322f28a067a03
Python-3.4.2.tar.xz: 0727d8a8498733baabe6f51632b9bab0cbaa9ada
python-3.4.1-docs-html.tar.bz2: acc5911f0e41774788121064e004941e6090542a
python-3.4.2-docs-html.tar.bz2: 29fd43d785d545959b744ba44c9cbe314c12804b

View file

@ -1,86 +0,0 @@
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -71,12 +71,17 @@
BASECFLAGS= @BASECFLAGS@
BASECPPFLAGS= @BASECPPFLAGS@
CONFIGURE_CFLAGS= @CFLAGS@
+# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions.
+# Use it when a compiler flag should _not_ be part of the distutils CFLAGS
+# once Python is installed (Issue #21121).
+CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@
CONFIGURE_CPPFLAGS= @CPPFLAGS@
CONFIGURE_LDFLAGS= @LDFLAGS@
# Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the
# command line to append to these values without stomping the pre-set
# values.
PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS)
+PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST)
# Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to
# be able to build extension modules using the directories specified in the
# environment variables
@@ -91,7 +96,7 @@
# Extra C flags added for building the interpreter object files.
CFLAGSFORSHARED=@CFLAGSFORSHARED@
# C flags used for building the interpreter object files
-PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
+PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
# Machine-dependent subdirectories
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -662,6 +662,7 @@
LIBTOOL_CRUFT
OTHER_LIBTOOL_OPT
UNIVERSAL_ARCH_FLAGS
+CFLAGS_NODIST
BASECFLAGS
OPT
ABIFLAGS
@@ -6504,7 +6505,7 @@
if test $ac_cv_declaration_after_statement_warning = yes
then
- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
fi
# if using gcc on alpha, use -mieee to get (near) full IEEE 754
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1147,6 +1147,7 @@
fi
AC_SUBST(BASECFLAGS)
+AC_SUBST(CFLAGS_NODIST)
# The -arch flags for universal builds on OSX
UNIVERSAL_ARCH_FLAGS=
@@ -1231,7 +1232,7 @@
if test $ac_cv_declaration_after_statement_warning = yes
then
- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement"
+ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement"
fi
# if using gcc on alpha, use -mieee to get (near) full IEEE 754
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,12 @@
cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ
+# Add special CFLAGS reserved for building the interpreter and the stdlib
+# modules (Issue #21121).
+cflags = sysconfig.get_config_var('CFLAGS')
+py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST')
+sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist
+
def get_platform():
# cross build
if "_PYTHON_HOST_PLATFORM" in os.environ:

View file

@ -1,4 +1,4 @@
%define docver 3.4.1
%define docver 3.4.2
%define dirver 3.4
%define familyver 3
@ -33,8 +33,8 @@
Summary: An interpreted, interactive object-oriented programming language
Name: python3
Version: 3.4.1
Release: 6
Version: 3.4.2
Release: 1
License: Modified CNRI Open Source License
Group: Development/Python
@ -63,8 +63,6 @@ Patch15: python3-3.4.0-dont-raise-from-py_compile.patch
%if %{with rewheel}
Patch16: python3-3.4.0-add-rewheel-module.patch
%endif
# http://bugs.python.org/issue21121
Patch17: python3-3.4.0-dont-add-Werror-declaration-after-statement.patch
Patch18: python3-3.4.0-disable-tests-in-test_urllib2_localnet.patch
Patch19: Python-nis-requires-tirpc.patch
Patch20: Python-select-requires-libm.patch
@ -217,7 +215,6 @@ Various applications written using tkinter
%patch16 -p1
%endif
%patch17 -p1
%patch18 -p0
%patch19 -p1 -b .tirpc~
%patch20 -p1 -b .lm~