From 603a9dc9d96a2e5dfc4710218546b0bf5290d2b2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 7 Aug 2017 10:36:19 +0200 Subject: [PATCH] - up to 3.6.2 --- python3-ac_fixes.patch | 51 ++++++++++++++++++++---------------- python3-installcompile.patch | 5 ++-- python3.spec | 6 ++--- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/python3-ac_fixes.patch b/python3-ac_fixes.patch index e7611ed..b005cdd 100644 --- a/python3-ac_fixes.patch +++ b/python3-ac_fixes.patch @@ -1,23 +1,30 @@ ---- Python-3.5.0/configure.ac~ 2015-09-13 13:41:26.000000000 +0200 -+++ Python-3.5.0/configure.ac 2015-09-13 20:06:11.597280920 +0200 -@@ -1258,16 +1258,16 @@ then - # Optimization messes up debuggers, so turn it off for - # debug builds. - if "$CC" -v --help 2>/dev/null |grep -- -Og > /dev/null; then -- OPT="-g -Og -Wall $STRICT_PROTO" -+ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" - else -- OPT="-g -O0 -Wall $STRICT_PROTO" -+ OPT="-g $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" - fi - else -- OPT="-g $WRAP -O3 -Wall $STRICT_PROTO" -+ OPT="-g $WRAP $CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" - fi - ;; - *) -- OPT="-O3 -Wall $STRICT_PROTO" -+ OPT="$CPPFLAGS $CFLAGS -Wall $STRICT_PROTO" - ;; - esac +--- Python-3.6.2/configure.ac~ 2017-07-08 05:33:27.000000000 +0200 ++++ Python-3.6.2/configure.ac 2017-08-07 10:28:44.498951134 +0200 +@@ -1494,26 +1494,7 @@ then + CFLAGS_ALIASING="-fno-strict-aliasing" + fi + +- case $ac_cv_prog_cc_g in +- yes) +- if test "$Py_DEBUG" = 'true' ; then +- # Optimization messes up debuggers, so turn it off for +- # debug builds. +- if "$CC" -v --help 2>/dev/null |grep -- -Og > /dev/null; then +- OPT="-g -Og -Wall" +- else +- OPT="-g -O0 -Wall" +- fi +- else +- OPT="-g $WRAP -O3 -Wall" +- fi +- ;; +- *) +- OPT="-O3 -Wall" +- ;; +- esac +- +- OPT="$OPT $STRICT_PROTO" ++ OPT="$OPT $CPPFLAGS $CFLAGS $STRICT_PROTO" + case $ac_sys_system in + SCO_SV*) OPT="$OPT -m486 -DSCO5" diff --git a/python3-installcompile.patch b/python3-installcompile.patch index 964b83c..20107ba 100644 --- a/python3-installcompile.patch +++ b/python3-installcompile.patch @@ -18,12 +18,13 @@ -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -@@ -1654,7 +1656,7 @@ +@@ -1700,7 +1700,7 @@ Python/thread.o: @THREADHEADERS@ .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools - .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean + .PHONY: frameworkaltinstallunixtools recheck clean clobber distclean -.PHONY: smelly funny patchcheck touch altmaninstall commoninstall +.PHONY: smelly funny patchcheck touch altmaninstall installcompile commoninstall .PHONY: gdbhooks # IF YOU PUT ANYTHING HERE IT WILL GO AWAY + diff --git a/python3.spec b/python3.spec index 1a36809..62cd3c6 100644 --- a/python3.spec +++ b/python3.spec @@ -38,13 +38,13 @@ Summary(ru.UTF-8): Язык программирования очень высо Summary(tr.UTF-8): X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili Summary(uk.UTF-8): Мова програмування дуже високого рівня з X-інтерфейсом Name: python3 -Version: %{py_ver}.1 -Release: 2 +Version: %{py_ver}.2 +Release: 1 Epoch: 1 License: PSF Group: Development/Languages/Python Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz -# Source0-md5: 692b4fc3a2ba0d54d1495d4ead5b0b5c +# Source0-md5: 2c68846471994897278364fc18730dd9 Source1: pyconfig.h.in Patch0: %{name}-pythonpath.patch Patch1: %{name}-ac_fixes.patch -- 2.44.0