[gtk-osx] Remove customizations for MacOS versions before MacOS X 10.8.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Remove customizations for MacOS versions before MacOS X 10.8.
- Date: Sat, 29 Apr 2017 18:12:14 +0000 (UTC)
commit 260de0f7afb6f33a95bf9c76087889da7b79398f
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 3 17:00:41 2017 -0700
Remove customizations for MacOS versions before MacOS X 10.8.
Includes removing PowerPC specializations and universal-build support
(the latter never really worked anyway).
Also check for at least Xcode-5.0.
jhbuildrc-gtk-osx | 318 ++++++-------------------
jhbuildrc-gtk-osx-custom-example | 101 ++------
modulesets-stable/bootstrap.modules | 21 --
modulesets-stable/gtk-osx-bootstrap.modules | 13 -
modulesets-stable/gtk-osx-network.modules | 37 ---
modulesets-stable/gtk-osx-universal.modules | 78 ------
modulesets-stable/gtk-osx.modules | 1 -
modulesets-unstable/gtk-osx-bootstrap.modules | 13 -
modulesets-unstable/gtk-osx-universal.modules | 141 -----------
modulesets-unstable/gtk-osx.modules | 1 -
modulesets/gtk-osx-bootstrap.modules | 13 -
modulesets/gtk-osx-universal.modules | 142 -----------
modulesets/gtk-osx.modules | 1 -
xcrun | 3 -
14 files changed, 100 insertions(+), 783 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 44fd76a..f9c9760 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -97,8 +97,6 @@ def osx_ver():
x64bit = _popen("sysctl hw.cpu64bit_capable").endswith("1")
if x64bit and _osx_version >= 6.0:
_default_arch = "x86_64"
- elif mstring.startswith("ppc") :
- _default_arch = "ppc"
else:
_default_arch = "i386"
@@ -108,9 +106,12 @@ def xcode_ver():
exp = re.compile(r'Xcode (\d+\.\d+)')
vernum = exp.match(ver)
if vernum:
- return float(vernum.group(1))
+ _xcode_ver = float(vernum.group(1))
+ if _xcode_ver < 5.0:
+ raise EnvironmentError("Xcode Version %f is not supported; if you want to build with Xcode
versions earlier than 5.0 checkout tag Last-Lion." % _xcode_ver)
+ return _xcode_ver
else:
- return 3.0
+ raise EnvironmentError("No suitable Xcode found. Xcode 5.0 or later is required.")
# Some utitily functions used here and in custom files:
#
@@ -163,9 +164,9 @@ def setup_debug():
# orderFront:] if gcc is passed -O0 for 64-bit compilation. The old
# stabs+ debug format also doesn't work. See Snow Leopard in the Wiki
# for more information about debugging.
- environ_prepend('CFLAGS', "-O0 -ggdb3")
- environ_prepend('CXXFLAGS', "-O0 -ggdb3")
- environ_prepend('OBJCFLAGS', "-O0 -ggdb3")
+ environ_prepend('CFLAGS', "-O0 -g")
+ environ_prepend('CXXFLAGS', "-O0 -g")
+ environ_prepend('OBJCFLAGS', "-O0 -g")
def setup_release():
environ_prepend('CFLAGS', "-O2")
@@ -175,122 +176,58 @@ def setup_release():
# Set up the environment for building against particular SDK.
#
-# These first two are just utility functions.
-def make_sdk_name(sdk_version):
- return "MacOSX" + sdk_version + ".sdk"
-
-def get_sdkdir(sdk_name, xcodepath, xcodeversion):
- platformpath = None
- if xcodeversion >= 4.3:
- platformpath = os.path.join("Platforms", "MacOSX.platform", "Developer")
- if xcodepath and platformpath:
- sdkdir = os.path.join(xcodepath, platformpath, "SDKs", sdk_name)
- elif xcodepath:
- sdkdir = os.path.join(xcodepath, "SDKs", sdk_name)
- else:
- sdkdir = os.path.join("/Developer", "SDKs", sdk_name)
-
- if not os.path.exists(sdkdir):
- sdkdir = ''
- if 'SDKPATH' in os.environ:
- try:
- sdkdir = [os.path.join(path, sdk_name) for path
- in os.environ['SDKPATH'].split(':')
- if os.path.exists(os.path.join(path, sdk_name))][0]
- except IndexError:
- pass
- if not sdkdir:
- raise EnvironmentError("%s not found" % sdk_name)
- return sdkdir
-
#We call osx_ver() here so that we can set up _default_arch for setup_sdk:
osx_ver()
#
-# This is the workhorse of the setup. Call this function with the
-# 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
-# been tested much on 10.5 and not all dependent packages are ready
-# for it (including ige-mac-integration).
+# This is the workhorse of the setup. Call this function from
+# .jhbuildrc-custom to configure compile and link flags. Optionally
+# specify a minimum MacOS version (10.6, 10.7, 10.8, etc.) and a list
+# of architectures.
#
-# Notes on 64-bit compilation: This function does what's required for
-# the packages that can be built for 64-bit; unfortunately, there are
-# still some issues in the underlying code that the gtk+ devs are
-# working on.
+# The sdk_version does nothing, as since Xcode 5 it is preferred to
+# build with the SDK that goes with the selected Xcode or command-line
+# tools, which we retrieve via xcrun. sdk_version remains in the
+# setup_sdk signature to prevent breaking existing jhbuildrc-customs.
#
-def setup_sdk(target, sdk_version, architectures=[_default_arch]):
+# For most users accepting the defaults is the right course.
+
+def setup_sdk(target=_osx_version, sdk_version=None, architectures=[_default_arch]):
os.environ["MACOSX_DEPLOYMENT_TARGET"] = target
sdkdir = None
xcodepath = None
xcodeversion = None
- try:
- xcodeversion = xcode_ver()
- except:
- print "Failed to find xcode. Make sure that it's installed and that xcode-select is set properly."
-
-
-#Note: You can use $DEVELOPER_DIR to override the default set with xcode-select.
- if _osx_version >= 5.0:
- xcodepath = _popen("xcode-select -print-path")
- elif os.environ.has_key("DEVELOPER_DIR"):
- xcodepath = os.environ["DEVELOPER_DIR"]
-
-#OSX 10.9 doesn't have /usr/include, so we need to set the sdkdir to XCode.app:
- if sdk_version == 'native' and _osx_version >= 9.0:
- sdk_version = '10.' + str(int(_osx_version))
-
- _toolpath = os.path.join("/usr", "bin")
- if xcodepath:
- _toolpath = os.path.join(xcodepath, "usr", "bin")
-#For XCode4 we need to disable ppc when building perl:
- if sdk_version != "native":
- sdkdir = get_sdkdir(make_sdk_name(sdk_version), xcodepath, xcodeversion)
- # Seems like we need this since many libraries otherwise only look for
- # various dependencies (e.g. libiconv) in /usr/lib, hence pulling in
- # the wrong -L that doesn't have fat binaries on pre-10.5.
- #
- environ_prepend("LDFLAGS", "-L" + sdkdir + "/usr/lib")
- environ_prepend("CFLAGS", "-I" + sdkdir + "/usr/include")
- environ_prepend("CXXFLAGS", "-I" + sdkdir + "/usr/include")
- environ_prepend("OBJCFLAGS", "-I" + sdkdir + "/usr/include")
- environ_prepend("CPPFLAGS", "-I" + sdkdir + "/usr/include")
- environ_prepend("CMAKE_PREFIX_PATH", os.path.join(sdkdir, 'usr'), ':')
- environ_prepend("LIBRARY_PATH", sdkdir + "/usr/lib", ':')
- # It looks like -isysroot is broken when building on 10.4, causing link
- # problems. But we don't really need to set it for 10.4 so just
- # skip that.
- #
-
- #It's often necessary to look for things in the SDK when
- #developing, and it takes a lot of typing, so define a
- #convenience environment variable:
- environ_append('SDKDIR', sdkdir)
- environ_append('SDKROOT', sdkdir)
-
-#Apple Documentation says that "-syslibroot" is the arg to pass to the
-#linker, but we are using the compiler to control the linker, and
-#everything seems to be working correctly.
- if not _osx_version < 5.0:
- environ_append("CFLAGS", "-isysroot " + sdkdir)
- environ_append("CPPFLAGS", "-isysroot " + sdkdir)
- environ_append("CXXFLAGS", "-isysroot " + sdkdir)
- environ_append("OBJCFLAGS", "-isysroot " + sdkdir)
- environ_append("LDFLAGS", "-isysroot " + sdkdir)
-
- # To pick up cups-config from the right place.
- #
- os.environ["CUPS_CONFIG"] = os.path.join(sdkdir,
- "usr/bin/cups-config")
-
- #Glib and autoconf-2.63 have issues with endianness
- #
+ sdkdir = _popen("xcrun --show-sdk-path")
+
+ environ_prepend("LDFLAGS", "-L" + sdkdir + "/usr/lib")
+ environ_prepend("CFLAGS", "-I" + sdkdir + "/usr/include")
+ environ_prepend("CXXFLAGS", "-I" + sdkdir + "/usr/include")
+ environ_prepend("OBJCFLAGS", "-I" + sdkdir + "/usr/include")
+ environ_prepend("CPPFLAGS", "-I" + sdkdir + "/usr/include")
+ environ_prepend("CMAKE_PREFIX_PATH", os.path.join(sdkdir, 'usr'), ':')
+ environ_prepend("LIBRARY_PATH", sdkdir + "/usr/lib", ':')
+
+ # It's often necessary to look for things in the SDK when
+ # developing, and it takes a lot of typing, so define a
+ # convenience environment variable:
+ environ_append('SDKDIR', sdkdir)
+ environ_append('SDKROOT', sdkdir)
+
+ # Apple Documentation says that "-syslibroot" is the arg to pass to the
+ # linker, but we are using the compiler to control the linker, and
+ # everything seems to be working correctly.
+ environ_append("CFLAGS", "-isysroot " + sdkdir)
+ environ_append("CPPFLAGS", "-isysroot " + sdkdir)
+ environ_append("CXXFLAGS", "-isysroot " + sdkdir)
+ environ_append("OBJCFLAGS", "-isysroot " + sdkdir)
+ environ_append("LDFLAGS", "-isysroot " + sdkdir)
+
+ # To pick up cups-config from the right place.
+ os.environ["CUPS_CONFIG"] = os.path.join(sdkdir, "usr/bin/cups-config")
+
if architectures == ["i386"]:
- append_autogenargs("glib", "ac_cv_c_bigendian=no")
# The '#' on openssl is to stop jhbuild from appending any more autogen
# arguments such as --disable-Werror; they cause openssl to error out
append_autogenargs("openssl", "darwin-i386-cc #")
@@ -298,41 +235,20 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
conditions.add('64-bit')
append_autogenargs("glib", "ac_cv_c_bigendian=no")
append_autogenargs("openssl", "darwin64-x86_64-cc #")
- elif architectures == ["ppc"]:
- append_autogenargs("glib", "ac_cv_c_bigendian=yes")
- append_autogenargs("gmp", 'CFLAGS="-force_cpusubtype_ALL $CFLAGS"')
- append_autogenargs("openssl", "darwin-ppc-cc #")
-
+ elif len(set(architectures) - set(["i386", "x86_64"])) > 0:
+ raise EnvironmentError("Only architectures i386 and x86_64 are supported.")
+ else:
+ print "WARNING: Universal builds are neither prohibited nor supported. It might work, but if it
doesn't you're on your own."
# For unknown reasons, iconv is not picked up correctly without this
#
- append_autogenargs('glib', ' --with-libiconv=gnu')
-
- # If we're building on Snow Leopard for 32-bit, we need to make
- # sure that Perl and Python are working in 32-bit mode.
- #
- if _osx_version >= 6.0 and architectures == ["i386"]:
- os.environ["VERSIONER_PERL_PREFER_32_BIT"] = "yes"
- os.environ["VERSIONER_PYTHON_PREFER_32_BIT"] = "yes"
-
- #SDK 10.4 doesn't support gcc4.2.
- if xcodeversion == 3.0 or sdk_version == "10.4u":
- if xcodeversion > 4.0:
- raise EnvironmentError("Can't build for 10.4 on Xcode 4 or later")
- os.environ["CC"] = os.path.join(_toolpath, "gcc-4.0")
- os.environ["OBJC"] = os.path.join(_toolpath, "gcc-4.0")
- os.environ["CXX"] = os.path.join(_toolpath, "g++-4.0")
- #Note that the following will use Clang with Xcode 5.0 and
- #llvm-gcc-4.2 on Xcode 4.x
- elif _osx_version >= 7.0 or xcodeversion > 4.0:
- os.environ["CC"] = os.path.join(_toolpath, "gcc")
- os.environ["OBJC"] = os.path.join(_toolpath, "gcc")
- os.environ["CXX"] = os.path.join(_toolpath, "g++")
- else:
- os.environ["CC"] = os.path.join(_toolpath, "gcc-4.2")
- os.environ["OBJC"] = os.path.join(_toolpath, "gcc-4.2")
- os.environ["CXX"] = os.path.join(_toolpath, "g++-4.2")
-
- os.environ['LD'] = os.path.join(_toolpath, "ld")
+ append_autogenargs('glib', ' --with-libiconv=gnu')
+ gcc = _popen("xcrun -f gcc")
+ gpp = _popen("xcrun -f g++")
+ ld = _popen("xcrun -f ld")
+ os.environ["CC"] = gcc
+ os.environ["OBJC"] = gcc
+ os.environ["CXX"] = gpp
+ os.environ['LD'] = ld
# Set the -arch flags for everything we're building.
#
@@ -356,28 +272,18 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
append_autogenargs("liboil", "--host=x86_64-apple-darwin")
append_autogenargs("gnutls", "--host=x86_64-apple-darwin")
- # Tiger has a somewhat messed-up resolv.h, so we need to explicitly
- # link libresolv:
- if _osx_version < 5.0 or sdk_version.startswith("10.4"):
- append_autogenargs("glib", 'LIBS="-lresolv"')
- else:
- # Tiger's CUPS version is too old
- skip.append('cups')
-
- # Leopard and later have m4
- if _osx_version >= 5.0:
- skip.append('m4')
-
# El Capitan needs bash to work around SIP. If you're using a
# common bootstrap directory (e.g. $HOME/.local) then override
# CONFIG_SHELL in .jhbuildrc-custom after calling setup_sdk().
config_shell = os.path.join(prefix, 'bin', 'bash')
if _osx_version < 11.0:
skip.append('bash')
- skip.append('openssl') # openssl removed in El Capitan
elif os.path.exists(config_shell):
os.environ['CONFIG_SHELL'] = config_shell
+ if os.path.exists(os.path.join(sdkdir, "usr", "include", "openssl")):
+ skip.append('openssl') # openssl removed in El Capitan
+
# gettext-fw rebuilds gettext with an in-tree libiconv to get
# around the Apple-provided one not defining _libiconv_init for
# x86_64
@@ -391,40 +297,24 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
#Overcome Python's obnoxious misconfiguration of portable builds
if len(architectures) == 1:
os.environ["BUILDCFLAGS"] = os.environ["CFLAGS"]
- #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 in ("10.6", "10.7", '10.8', '10.9', 'native')
- and (_osx_version >= 6.0))):
- append_autogenargs("glib", "ac_cv_compliant_posix_memalign=no")
-
append_autogenargs("gnutls", "--disable-guile")
-
- #Guile doesn't handle optimization well with llvm-gcc
- if _osx_version >= 7.0 and xcodeversion > 4.0:
- append_autogenargs("guile", 'CFLAGS="$CFLAGS -O1"')
+ append_autogenargs("guile", 'CFLAGS="$CFLAGS -O1"')
#Defining ARCHFLAGS globally messes up waf, so we need to define
#it here for our two perl modules:
- if architectures != ['ppc']:
- module_extra_env.update(
+ module_extra_env.update(
{"perl-xml-simple":{"ARCHFLAGS":"-arch i386 -arch x86_64"},
"perl-xml-parser":{"ARCHFLAGS":"-arch i386 -arch x86_64"}})
- #Xcode 5 uses clang; there's no gcc-llvm anymore. Some packages
- #require special arguments or flags to compile:
- if xcodeversion >= 5.0:
- module_extra_env["pkg-config"] = {'CFLAGS': os.environ['CFLAGS'] + ' -std=gnu89'}
- append_autogenargs('libgcrypt', 'CFLAGS="$CFLAGS -fheinous-gnu-extensions"')
- module_makeargs['liboil'] = 'CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE -fheinous-gnu-extensions"'
- module_extra_env["WebKit"] = {'CXXFLAGS':os.environ['CXXFLAGS'] +
+ #Some packages require special arguments or flags to compile with Clang:
+ module_extra_env["pkg-config"] = {'CFLAGS': os.environ['CFLAGS'] + ' -std=gnu89'}
+ append_autogenargs('libgcrypt', 'CFLAGS="$CFLAGS -fheinous-gnu-extensions"')
+ module_makeargs['liboil'] = 'CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE -fheinous-gnu-extensions"'
+ module_extra_env["WebKit"] = {'CXXFLAGS':os.environ['CXXFLAGS'] +
' -stdlib=libstdc++'}
- append_autogenargs('babl', '--disable-sse')
+ module_extra_env["expat"] = {'CFLAGS':os.environ['CFLAGS'] + ' -arch i386 -arch x86_64'}
+ append_autogenargs('babl', '--disable-sse')
# openssl doesn't understand DESTDIR, but luckily it has its own mechanism.
- module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
-
- if xcodeversion >= 4.0 and target in ('10.6', '10.5', '10.4'):
- environ_append('LDFLAGS',
- '-Wl,-no_function_starts -Wl,-no_version_load_command')
+# module_extra_env['openssl'] = {'INSTALL_PREFIX': os.path.join(prefix, '_jhbuild', 'root-openssl')}
# Finally when building normally we need to force CFLAGS_FOR_BUILD
# to our current CFLAGS so that everything will link with other
@@ -437,56 +327,6 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
environ_remove('PATH', '/opt/X11/bin')
return sdkdir
-# This is a convenience function for older .jhbuildrc-customs.
-def setup_sdk_10_4():
- print "*** Using setup_sdk_10_4() is deprecated. Use setup_sdk instead. ***"
- if _default_arch == "x86_64":
- return setup_sdk("10.4", "10.4u", ["i386"])
- return setup_sdk("10.4", "10.4u")
-
-# For cross-compiling on an intel system. The need to build tool
-# packages universal for cross-compilation means that it will take
-# longer than necessary on a ppc machine, so just call
-# setup_sdk("10.4", "10.4", ["ppc"]) and all will be well (or with "10.5"
-# instead of "10.4" if you're building Tiger-incompatable versions).
-def setup_ppc_build():
- print "Setup PPC"
- _sdkdir = setup_sdk(target="10.4", sdk_version="10.5", architectures=["ppc"])
-
- if _sdkdir == None:
- raise Exception("Cross-compiling without specifying an SDK is not supported")
-
- _cflags = '-isysroot ' + _sdkdir + ' -mmacosx-version-min=10.4'
- _cxxflags = _cflags
- _cppflags = '-I' + prefix + '/include -isysroot ' + _sdkdir
- _ldflags = '-L' + prefix + '/lib -Wl,-syslibroot,' + _sdkdir +' -mmacosx-version-min=10.4'
-
- environ_append('CFLAGS', '-arch ppc')
- environ_append('CXXFLAGS', '-arch ppc')
- environ_append('OBJCFLAGS', '-arch ppc')
- environ_append('LDFLAGS', '-arch ppc')
-
- _ppc_args = "CFLAGS='" + _cflags + " -arch ppc' CXXFLAGS='" + _cxxflags + " -arch ppc' LDFLAGS='" +
_ldflags + " -arch ppc' --build=powerpc-apple-darwin NM=nm"
-
- _univ_args = "CFLAGS='" + _cflags + " -arch ppc -arch i386' CXXFLAGS='" + _cxxflags + " -arch ppc -arch
i386' LDFLAGS='" + _ldflags + " -arch ppc -arch i386'"
-
-# Some packages need to be build universal so that they'll work in a
-# cross-compiled environment:
- append_autogenargs("gettext", _univ_args)
- append_autogenargs("intltool", _univ_args)
- append_autogenargs("expat", _univ_args)
- append_autogenargs("gtk-doc", _univ_args)
-# Others need to be told explicitly that they're being cross-compiled:
- append_autogenargs("glib", _ppc_args + " glib_cv_uscore=no ac_cv_func_posix_getgrgid_r=yes
glib_cv_stack_grows=no ac_cv_func_posix_getpwuid_r=yes ac_cv_c_bigendian=yes" )
-
- append_autogenargs("gtk", _ppc_args + " --with-gdktarget=quartz --without-libjasper --disable-glibtest
gio_can_sniff='yes'")
-
- append_autogenargs("libgcrypt", _ppc_args )
- append_autogenargs("gnome-keyring", _ppc_args )
- append_autogenargs("WebKit", _ppc_args)
- append_autogenargs("OpenSP", _ppc_args)
- append_autogenargs("libdbi", _ppc_args)
- append_autogenargs("libdbi-drivers", _ppc_args)
###### End Function Definitions #######
@@ -530,15 +370,9 @@ _gtk_osx_default_build = ""
#print "Default Architecture %s\n" % _default_arch
-if _osx_version < 4.0:
- print "Error: Mac OS X 10.4 or newer is required, exiting."
+if _osx_version < 8.0:
+ print "Error: Mac OS X 10.8 or newer is required, exiting."
raise SystemExit
-elif _osx_version < 5.0:
- # Tiger, we want to use the python version from jhbuild.
- _host_tiger = True
-else:
- # Leopard or newer.
- _host_tiger = False
###### Import Customizations ######
@@ -611,10 +445,6 @@ if not (os.environ.has_key ("LIBTOOLIZE") and os.environ["LIBTOOLIZE"]):
environ_append('LIBTOOLIZE', os.path.join(prefix, "bin", "libtoolize"))
-if not _host_tiger:
- skip.append('make')
- skip.append('subversion')
-
# The option "headerpad_max_install_names" is there to leave some room for
# changing the library locations with install_name_tool. Note that GNU
# libtool seems to drop the option if we don't use -W here.
diff --git a/jhbuildrc-gtk-osx-custom-example b/jhbuildrc-gtk-osx-custom-example
index 7152311..4057c7d 100644
--- a/jhbuildrc-gtk-osx-custom-example
+++ b/jhbuildrc-gtk-osx-custom-example
@@ -1,9 +1,7 @@
# -*- mode: python -*-
# All of jhbuild is Python, so there are all sorts of interesting
-# things you can do to customize your build with python commands. This
-# file is treated like a python __init__ file, so you can do all sorts
-# of interesting things in it.
+# things you can do to customize your build with python commands.
# The URL for repositories can be overridden. This is how you'd set
# your developer access to an SVN repo. It doesn't work, of course,
@@ -23,11 +21,6 @@ if _jhb is None:
# checkoutroot = os.path.expanduser("~/Source/gtk")
# prefix = "/opt/gtk"
pass
-elif _jhb == "FW":
- # The framework build...
- # checkoutroot = os.path.expanduser("~/Source/gtk-fw")
- # prefix = "/opt/gtk-fw"
- pass
# Do note, though, that jhbuildrc-gtk-osx also uses $JHB to find
# another customization file that is loaded after this one. You can,
# of course, define your own environment variables for passing in
@@ -50,7 +43,7 @@ elif _jhb == "FW":
# if "libglade" in skip:
# skip.remove("libglade")
-# Uncomment the following if you're running OSX 10.11 and SIP (see
https://developer.apple.com/library/prerelease/mac/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html)
+# Uncomment the following if you're running OSX 10.11 or later and SIP (see
https://developer.apple.com/library/prerelease/mac/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html)
# causes shell-script build failures. You'll also need to edit those
# shell scripts to change the shebang from /bin/sh to $PREFIX/bin/bash.
# Note that /usr/bin/env bash won't work, because it will also strip
@@ -61,13 +54,6 @@ elif _jhb == "FW":
# if "bash" in skip:
# skip.remove("bash")
-# Set this to True/False if you want to force using or not building
-# and using python as part of jhbuild. If not set, the script will use
-# the system python when building on 10.5 or newer only.
-#
-# _gtk_osx_use_jhbuild_python = True
-
-
# In addition, you can override _exec_prefix (used to set $M4 and
# $LIBTOOLIZE); by default it's set to prefix. You might want to reset
# it if you want to bootstrap to one directory and build in another
@@ -81,54 +67,29 @@ elif _jhb == "FW":
# _exec_prefix = os.path.join(os.path.expanduser("~"), "Source", "bootstrap")
# tarballdir = os.path.join(os.path.expanduser("~"), "Source", "Download")
-# .jhbuildrc has a master function, setup_sdk(target, sdk_version,
-# [architectures]) which sets up the build environment. You *must*
-# call it or one of the functions (setup_sdk_10_4(),
-# setup_ppc_build(), or setup_universal_build()) in jhbuildrc-custom.
-#
+# .jhbuildrc has a master function, setup_sdk(target, architecture)
+# which sets up the build environment. You *must* call it in jhbuildrc-custom.
+
# Target is the earliest version of MacOS on which the result binary
# can run, in the form "10.X" or "native" (the default). It sets
# MACOS_DEPLOYMENT_TARGET and the -macosx-version-min CFLAG.
-#
-# Setup_sdk can be any version from "10.4u" or later, or "native". On
-# MacOS X 10.8 and earlier, 'native' won't set -sysroot so the build
-# will use the headers in libraries in /usr. Apple removed the headers
-# in MacOS X 10.9 so on those systems -sysroot is set to the SDK
-# directory.
-
-# If you are building for distribution with Xcode 6.x or older, you
-# probably want to use the lowest SDK which will successfully build
-# your modules. The exception is if you are building under Tiger,
-# because a) You're already using the lowest compatible SDK b) Cups
-# 1.2.12, which you must install to build Gtk+, installs new headers
-# and libraries into /usr but not into
-# /Developer/SDKs/MacOSX_sdk_10.4u. From Xcode 7/MacOSX10.10.sdk on
-# Apple provided a new format dylib stub that links with dylibs from
-# earlier versions of MacOS. If you're using Xcode 7 or later you
-# should use the native SDK and pass the target of the earliest
-# version you intend to support.
-#
-# Architectures is a list (pass the arguments in brackets) which can
-# include the values "ppc", "ppc64", "i386", "x86_64", and
-# _default_arch. That last one is a variable and doesn't get
-# quotes.
-#
-# Setup_universal_build: Don't pass multiple arguments directly to
-# setup_sdk, though, because that would build universal and several
-# packages need special handling to build universal. Use
-# setup_universal_build instead. Do note, though, that while
-# setup_universal_build will build across PowerPC and Intel
-# architectures successfully, the result will usually crash because of
-# endianness problems with icon caches. Help is welcome to fix
-# this. The special argument _default_arch is a variable set by
-# jhbuildrc depending on what platform you're on. It doesn't set the
-# -arch CFLAG at all, so your architecture will be whatever you get
-# that way. Note that on Snow Leopard and later, if you are building
-# on a 64-bit processor (Xeon, Core2duo, or one of the Core iFoo
-# procesors), the architecure is x86_64 by default; otherwise it's
-# i386, which is 32-bit. Note as well that for most purposes 32-bit
-# code runs well on 64-bit Macs so there's no real benefit to
-# i386+x86_64 or ppc+ppc64.
+
+# From Xcode 7/MacOSX10.11.sdk on Apple has provided a new format
+# dylib stub that links with dylibs from earlier versions of MacOS and
+# has been tested to work back to 10.6 if MACOS_X_VERSION_MIN is set
+# appropriately. Earlier SDKs lack this feature and may or may not
+# actually work on MacOS X versions earlier than the SDK's; whether
+# they do depends on whether the SDK contains a newer "compatibility
+# version" library than the system on which you're attempting to run
+# and which is required by your application.
+
+# Architecture is a list for backwards compatibility; it can contain
+# "i386" and/or "x86_64" and defaults to the machine's architecture if
+# left out. Passing both architectures will in theory build a
+# universal binary but this is untested. Since MacOS X 10.7 and later
+# run only on x86_64 systems it doesn't make sense to change this
+# unless you're targeting 10.6. 32-bit ("i386") programs run fine on
+# 64-bit systems.
# There are also some utility functions which you may find useful:
#
@@ -148,21 +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 = "10.%d" % _osx_version;
-
-setup_sdk(target=_target, sdk_version="native", architectures=[_default_arch])
-#
-# setup_sdk(target="10.4", sdk_version="10.4u", architectures=["i386"])
-#
-# or set up to cross-compile a ppc build from an intel machine:
-#
-# setup_ppc_build()
-#
-# or a universal build:
-#
-# setup_universal_build(target="10.5", sdk_version="10.5",
-# architectures=["ppc", "i386"])
+setup_sdk()
+# Comment out the previous and uncomment this one to build for all
+# systems running SnowLeopard and later:
+# setup_sdk(target="10.6")
# Modify the arguments passed to configure:
#
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 47ad38e..38a067a 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -21,10 +21,6 @@
<repository type="tarball" name="intltool"
href="http://launchpad.net/intltool/trunk/"/>
- <autotools id="make" bootstrap="true">
- <branch repo="ftp.gnu.org" module="make/make-3.82.tar.gz" version="3.82"/>
- </autotools>
-
<autotools id='readline' autogen-sh="configure">
<branch repo="ftp.gnu.org" module="readline/readline-6.3.tar.gz"
version="6.3">
@@ -55,14 +51,6 @@
</dependencies>
</autotools>
- <autotools id="subversion">
- <branch repo="apache.org" module="subversion/subversion-1.5.9.tar.bz2"
- version="1.5.9"/>
- <dependencies>
- <dep package="apr-util"/>
- </dependencies>
- </autotools>
-
<autotools id="gettext-tools" autogen-sh="configure"
autogenargs="--without-emacs --disable-java --disable-native-java --disable-libasprintf
--disable-csharp --with-included-glib">
<branch repo="ftp.gnu.org" source-subdir="gettext-tools"
@@ -77,17 +65,11 @@
</branch>
</autotools>
- <autotools id="m4" autogen-sh="configure" bootstrap="true">
- <branch repo="ftp.gnu.org"
- module="m4/m4-1.4.17.tar.xz" version="1.4.17"/>
- </autotools>
-
<autotools id="autoconf" autogen-sh="configure" bootstrap="true">
<branch repo="ftp.gnu.org"
module="autoconf/autoconf-2.69.tar.xz" version="2.69"/>
<dependencies>
<dep package="xz"/>
- <dep package="m4"/>
</dependencies>
</autotools>
@@ -231,13 +213,10 @@
<metamodule id="meta-bootstrap">
<dependencies>
<dep package="xz"/>
- <dep package="make"/> <!-- Needed for Tiger, skipped otherwise -->
- <dep package="subversion"/> <!-- Needed for Tiger, skipped otherwise -->
<dep package="gettext-tools" /> <!-- Needed for 64-bit -->
<dep package="readline" />
<dep package="bash" /> <!-- Needed for El Cap and later to work around SIP. -->
<dep package="cmake"/>
- <dep package="m4"/> <!-- Can be skipped for Leopard and later -->
<dep package="autoconf" />
<dep package="autoconf-archive" />
<dep package="libtool" />
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 5cf2735..32f8786 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -22,8 +22,6 @@
href="git://git.gnome.org/"/>
<repository type="tarball" name="harfbuzz"
href="http://www.freedesktop.org/software/harfbuzz/release/"/>
- <repository type="tarball" name="cups"
- href="https://www.cups.org/software/"/>
<repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
<repository type="tarball" name="icu"
href="http://download.icu-project.org/files/"/>
@@ -74,16 +72,6 @@
</dependencies>
</autotools>
- <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
- <autotools id='cups' autogen-sh='configure' skip-autogen='never'
- autogenargs='DSOFLAGS="$LDFLAGS"'>
- <branch module="1.2.12/cups-1.2.12-source.tar.bz2"
- version="1.2.12" repo="cups" checkoutdir='cups-1.2.12'/>
- <dependencies>
- <dep package="libtiff"/>
- </dependencies>
- </autotools>
-
<autotools id="itstool" autogen-sh="configure">
<branch module="itstool/itstool-2.0.2.tar.bz2" version="2.0.2"
repo="itstool"/>
@@ -201,7 +189,6 @@
<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
- <dep package="cups"/>
<dep package="libpng"/>
<dep package="libjpeg"/>
<dep package="libtiff"/>
diff --git a/modulesets-stable/gtk-osx-network.modules b/modulesets-stable/gtk-osx-network.modules
index 1ea3f65..87b9b1c 100644
--- a/modulesets-stable/gtk-osx-network.modules
+++ b/modulesets-stable/gtk-osx-network.modules
@@ -147,43 +147,6 @@
</after>
</autotools>
- <!--WebKit 1.10 doesn't build with the 10.5 SDK, so use this older version for
- old builds.-->
- <autotools id="WebKit1.6" autogen-sh="configure"
- autogenargs="--with-target=quartz --disable-video --with-font-backend=pango --with-gtk=2.0">
- <branch repo="webkit.org" module="webkit-1.6.1.tar.gz" version="1.6.1">
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-no-x11.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-pango-includes.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-missing-utf8-include.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-enable-blob.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-gnome-3.6-fixup.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-clang-fixup.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-out-of-source-fixup.patch";
- strip="1"/>
- <patch
file="https://git.gnome.org/browse/gtk-osx/plain/patches/webkit-1.6-remove-pangoft2-dependency.patch";
- strip="1"/>
- <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/bug-92264-webkit-bison-2.6.patch";
- strip="1"/>
- </branch>
- <dependencies>
- <dep package="enchant"/>
- <dep package="icu"/>
- <dep package="libsoup"/>
- <dep package="meta-gtk-osx-freetype"/>
- </dependencies>
- <after>
- <dep package="meta-gtk-osx-core"/>
- <dep package="meta-gstreamer-1.0"/>
- <dep package="meta-gtk-osx-gtk3"/>
- </after>
- </autotools>
-
<!-- This is WebKitGTK 2.4.x, the last version that had the WebKit1 API.
disable-webkit2: Requires both GTK2 and 3. Currently not supported.
disable-credential-storage: Requires libsecret. No module for this yet.
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 06c94ee..539525f 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -52,7 +52,6 @@
<include href="gtk-osx-random.modules"/>
<include href="gtk-osx-themes.modules"/>
<include href="gtk-osx-unsupported.modules"/>
- <include href="gtk-osx-universal.modules"/>
<metamodule id="meta-gtk-osx-core">
<dependencies>
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 4c5ee42..f7a3706 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -22,8 +22,6 @@
href="ftp://xmlsoft.org/libxml2/"/>
<repository type="git" name="git.gnome.org"
href="git://git.gnome.org/"/>
- <repository type="tarball" name="cups"
- href="https://www.cups.org/software/"/>
<repository type="tarball" name="itstool" href="http://files.itstool.org/"/>
<repository type="git" name="github" href="https://github.com/"/>
<repository type="tarball" name="icu"
@@ -79,16 +77,6 @@
</dependencies>
</autotools>
- <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
- <autotools id='cups' autogen-sh='configure' skip-autogen='never'
- autogenargs='DSOFLAGS="$LDFLAGS"'>
- <branch module="1.2.12/cups-1.2.12-source.tar.bz2"
- version="1.2.12" repo="cups" checkoutdir='cups-1.2.12'/>
- <dependencies>
- <dep package="libtiff"/>
- </dependencies>
- </autotools>
-
<autotools id="itstool">
<branch module="itstool/itstool-2.0.2.tar.bz2" version="2.0.2"
repo="itstool"/>
@@ -209,7 +197,6 @@
<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
<dep package="readline"/>
- <dep package="cups"/>
<dep package="libpng"/>
<dep package="libjpeg"/>
<dep package="libtiff"/>
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index 43a9f2f..adc1938 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -44,7 +44,6 @@
<include href="gtk-osx-themes.modules"/>
<include href="gtk-osx-random.modules"/>
<include href="gtk-osx-unsupported.modules"/>
- <include href="gtk-osx-universal.modules"/>
<metamodule id="meta-gtk-osx-core">
<dependencies>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 311c85a..1782c35 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -22,8 +22,6 @@
href="ftp://xmlsoft.org/libxml2/"/>
<repository type="git" name="git.gnome.org"
href="git://git.gnome.org/"/>
- <repository type="tarball" name="cups"
- href="https://www.cups.org/software/"/>
<repository type="git" name="github" href="https://github.com/"/>
<repository type="tarball" name="icu"
href="http://download.icu-project.org/files/"/>
@@ -80,16 +78,6 @@
</dependencies>
</autotools>
- <!-- Cups is needed *only* for Tiger, and skipped otherwise -->
- <autotools id='cups' autogen-sh='configure' skip-autogen='never'
- autogenargs='DSOFLAGS="$LDFLAGS"'>
- <branch module="1.2.12/cups-1.2.12-source.tar.bz2"
- version="1.2.12" repo="cups" checkoutdir='cups-1.2.12'/>
- <dependencies>
- <dep package="libtiff"/>
- </dependencies>
- </autotools>
-
<autotools id="itstool">
<branch repo="github" module="itstool/itstool" tag="2.0.2"/>
<dependencies>
@@ -189,7 +177,6 @@
<metamodule id="meta-gtk-osx-bootstrap">
<dependencies>
<dep package="readline"/>
- <dep package="cups"/>
<dep package="libpng"/>
<dep package="libjpeg"/>
<dep package="libtiff"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index e9aad31..d173f59 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -44,7 +44,6 @@
<include href="gtk-osx-themes.modules"/>
<include href="gtk-osx-random.modules"/>
<include href="gtk-osx-unsupported.modules"/>
- <include href="gtk-osx-universal.modules"/>
<metamodule id="meta-gtk-osx-core">
<dependencies>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
