[gtk-osx] Update Python3 to 3.6.8, adjusting patch as needed.



commit 81a0af3083b9ee3f8581bd4f7ce2e8adf0108342
Author: John Ralls <jralls ceridwen us>
Date:   Sun May 19 08:07:37 2019 -0700

    Update Python3 to 3.6.8, adjusting patch as needed.
    
    Closes https://gitlab.gnome.org/GNOME/gtk-osx/issues/8

 modulesets-stable/gtk-osx-python.modules   |  4 ++--
 modulesets-unstable/gtk-osx-python.modules |  4 ++--
 modulesets/gtk-osx-python.modules          |  4 ++--
 patches/Python3.4-stack_size-flag.patch    | 34 ------------------------------
 patches/Python3.6-stack-size-flag.patch    | 26 +++++++++++++++++++++++
 5 files changed, 32 insertions(+), 40 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index 891b18b..29f7f83 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -95,8 +95,8 @@
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="autoreconf">
-    <branch repo="python" module="3.6.4/Python-3.6.4.tar.xz" version="3.6.4">
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.4-stack_size-flag.patch"; strip="1"/>
+    <branch repo="python" module="3.6.8/Python-3.6.8.tar.xz" version="3.6.8">
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.6-stack_size-flag.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="gettext-runtime"/>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index eca545e..cdf019c 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -73,8 +73,8 @@
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="autoreconf">
     <branch repo="python"
-           module="3.6.4/Python-3.6.4.tar.xz" version="3.6.4">
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.4-stack_size-flag.patch"; strip="1"/>
+           module="3.6.8/Python-3.6.8.tar.xz" version="3.6.8">
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.6-stack_size-flag.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="gettext-runtime"/>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 21f0595..b98ef3e 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -74,8 +74,8 @@
   </autotools>
 
   <autotools id="python3" autogenargs="--enable-shared" autogen-sh="autoreconf">
-    <branch repo="python" module="3.6.4/Python-3.6.4.tar.xz" version="3.6.4">
-      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.4-stack_size-flag.patch"; strip="1"/>
+    <branch repo="python" module="3.6.8/Python-3.6.8.tar.xz" version="3.6.8">
+      <patch 
file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/Python3.6-stack_size-flag.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="gettext-runtime"/>
diff --git a/patches/Python3.6-stack-size-flag.patch b/patches/Python3.6-stack-size-flag.patch
new file mode 100644
index 0000000..0afe3ea
--- /dev/null
+++ b/patches/Python3.6-stack-size-flag.patch
@@ -0,0 +1,26 @@
+--- a/configure.ac     2018-12-23 13:37:14.000000000 -0800
++++ b/configure.ac     2019-05-19 07:26:48.000000000 -0700
+@@ -1874,6 +1874,11 @@
+             then
+                 CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
+                 LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++              # Issue #18075: the default maximum stack size (8MBytes) is too
++              # small for the default recursion limit. Increase the stack size
++              # to ensure that tests don't crash
++              LDFLAGS="-Wl,-stack_size,1000000 $(LDFLAGS)"
++
+                 CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+             else
+                 CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
+@@ -2698,11 +2703,6 @@
+       Darwin/*)
+               LINKFORSHARED="$extra_undefs -framework CoreFoundation"
+
+-              # Issue #18075: the default maximum stack size (8MBytes) is too
+-              # small for the default recursion limit. Increase the stack size
+-              # to ensure that tests don't crash
+-              LINKFORSHARED="-Wl,-stack_size,1000000 $LINKFORSHARED"
+-
+               if test "$enable_framework"
+               then
+                       LINKFORSHARED="$LINKFORSHARED 
"'$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]