[gtk-osx] Bug 766738: Gobject-introspection 64-bit scan fails with Apple python.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Bug 766738: Gobject-introspection 64-bit scan fails with Apple python.
- Date: Thu, 26 May 2016 17:43:17 +0000 (UTC)
commit 9c940f7cb54ca6603ae846f9b550ad63abac5062
Author: John Ralls <jralls ceridwen us>
Date: Thu May 26 10:38:51 2016 -0700
Bug 766738: Gobject-introspection 64-bit scan fails with Apple python.
The built-in distutils flags cause a compile assert on
sizeof(unsigned long long) == sizeof(guint64_t). Make python a hard
dependency for 64-bit builds.
jhbuildrc-gtk-osx | 1 +
modulesets-stable/gtk-osx.modules | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 6d4110e..6e4f725 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -293,6 +293,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
append_autogenargs("glib", "ac_cv_c_bigendian=no")
append_autogenargs("openssl", "darwin-i386-cc")
elif architectures == ["x86_64"]:
+ conditions.add('64-bit')
append_autogenargs("glib", "ac_cv_c_bigendian=no")
append_autogenargs("openssl", "darwin64-x86_64-cc")
elif architectures == ["ppc"]:
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 476b8f2..b6515ef 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -120,10 +120,15 @@
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
+ <if condition-set='64-bit'>
+ <dep package='python'/>
+ </if>
</dependencies>
- <after>
- <dep package='python'/>
- </after>
+ <if condition-unset='64-bit'>
+ <after>
+ <dep package='python'/>
+ </after>
+ </if>
</autotools>
<autotools id="pango" autogen-sh="autoreconf">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]