[gtk-osx] Put stack_size linker flag in the right place
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Put stack_size linker flag in the right place
- Date: Mon, 23 Mar 2015 02:01:10 +0000 (UTC)
commit 867b6600f79869b53804d0b118c8ba3a7ea552de
Author: John Ralls <john aeolus local>
Date: Sun Mar 22 17:43:17 2015 +0900
Put stack_size linker flag in the right place
Having it in $LINKSHAREDFLAGS passes it on to shared libraries linked
against libpython and -stack_size is allowed only on executables.
modulesets-stable/gtk-osx-python.modules | 4 ++-
modulesets-unstable/gtk-osx-python.modules | 1 +
modulesets/gtk-osx-python.modules | 4 ++-
patches/Python3.4-stack_size-flag.patch | 34 ++++++++++++++++++++++++++++
4 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index ba4d789..02ac403 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -85,7 +85,9 @@
</autotools>
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
- <branch repo="python" module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3"/>
+ <branch repo="python" module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Python3.4-stack_size-flag.patch"
strip="1"/>
+ </branch>
<dependencies>
<dep package="gettext-runtime"/>
<dep package='readline'/>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index 9154eaf..4f51708 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -74,6 +74,7 @@
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
<branch repo="python"
module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Python3.4-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 d3d58f2..7e3a8b1 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -62,7 +62,9 @@
</autotools>
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
- <branch repo="python" module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3"/>
+ <branch repo="python" module="3.4.3/Python-3.4.3.tar.xz" version="3.4.3">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Python3.4-stack_size-flag.patch"
strip="1"/>
+ </branch>
<dependencies>
<dep package="gettext-runtime"/>
<dep package='readline'/>
diff --git a/patches/Python3.4-stack_size-flag.patch b/patches/Python3.4-stack_size-flag.patch
new file mode 100644
index 0000000..02d73d3
--- /dev/null
+++ b/patches/Python3.4-stack_size-flag.patch
@@ -0,0 +1,34 @@
+diff -c /Users/john/Development/gtk-sources/Python-3.4.3/configure.ac\~
/Users/john/Development/gtk-sources/Python-3.4.3/configure.ac
+*** a/configure.ac Wed Feb 25 20:27:46 2015
+--- b/configure.ac Sun Mar 22 12:48:43 2015
+***************
+*** 1302,1307 ****
+--- 1302,1313 ----
+
+ 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)
++
++
+ if test "${UNIVERSALSDK}" != "/"
+ then
+ CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+***************
+*** 2160,2170 ****
+ 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)'
+--- 2166,2171 ----
+
+Diff finished. Sun Mar 22 17:34:44 2015
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]