[gtk-osx] Update versions for Mavericks
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update versions for Mavericks
- Date: Fri, 19 Jul 2013 23:33:39 +0000 (UTC)
commit c512eebe9074ffea4fe8f1fd5d5da5c6089a0f54
Author: John Ralls <jralls ceridwen us>
Date: Fri Jul 19 16:33:18 2013 -0700
Update versions for Mavericks
jhbuildrc-gtk-osx | 7 +++----
jhbuildrc-gtk-osx-custom-example | 8 ++++++--
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index beff1af..bc57920 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -180,8 +180,8 @@ osx_ver()
#
# This is the workhorse of the setup. Call this function with the
-# target OSX version (10.4, 10.5, 10.6, or 10.7), the sdk version you want
-# to use (10.4u, 10.5, 10.6 or 10.7), and a list of architectures. As you
+# target OSX version (10.4, 10.5, 10.6, etc.), the sdk version you want
+# to use (10.4u, 10.5, 10.6, etc.), and a list of architectures. As you
# can see, the architectures defaults to a single build of i386 or
# ppc, depending on your machine. I386 is chosen for intel
# architectures as a default to ensure compatibility: 64-bit hasn't
@@ -334,8 +334,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
#Glib wants to use posix_memalign if it's available, but it's only
#available after 10.6, and there's no weak linking support for it:
if ((target == "10.4" or target == "10.5")
- and (sdk_version == "10.6" or sdk_version == "10.7"
- or sdk_version == "native"
+ and (sdk_version in ("10.6", "10.7", '10.8', '10.9', 'native')
and (_osx_version >= 6.0))):
append_autogenargs("glib", "ac_cv_compliant_posix_memalign=no")
diff --git a/jhbuildrc-gtk-osx-custom-example b/jhbuildrc-gtk-osx-custom-example
index 480916b..5469c12 100644
--- a/jhbuildrc-gtk-osx-custom-example
+++ b/jhbuildrc-gtk-osx-custom-example
@@ -78,7 +78,7 @@ elif _jhb == "FW":
# Target can be "10.4", "10.5", or "10.6". It sets
# MACOS_DEPLOYMENT_TARGET and the -macosx-version-min CFLAG.
#
-# Setup_sdk can be "10.4u", "10.5", "10.6" or "native". "Native" will
+# Setup_sdk can be any version from "10.4u" or later, or "native". "Native" will
# not set -sysroot in CFLAGS, so headers and dylibs will come from
# /usr instead of /Developer/SDKs/MacOSX_sdk.10.foo. If you are
# building for distribution, you probably want to use the lowest SDK
@@ -109,7 +109,11 @@ elif _jhb == "FW":
# Set up a particular target and SDK: For default operation, set the
# architecture and SDK for the native machine:
_target = None;
-if _osx_version >= 7.0:
+if _osx_version >= 9.0:
+ _target = "10.7"
+elif _osx_version >= 8.0:
+ _target = "10.7"
+elif _osx_version >= 7.0:
_target = "10.7"
elif _osx_version >= 6.0:
_target = "10.6"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]