[gtk-osx] Delete the universal and framework build options.

[John Ralls <jralls src gnome org>]

commit 064780f3912b71d333360915a473431c2db2ce4e
Author: John Ralls <jralls ceridwen us>
Date:   Sat May 2 13:56:34 2015 -0700

    Delete the universal and framework build options.
    
    Neither ever really worked and so weren't maintained.

 jhbuildrc-gtk-osx              |  110 ---------------------------------
 jhbuildrc-gtk-osx-cfw-10.4     |   65 --------------------
 jhbuildrc-gtk-osx-cfw-10.4u    |  131 ----------------------------------------
 jhbuildrc-gtk-osx-fw-10.4      |   62 -------------------
 jhbuildrc-gtk-osx-fw-10.4-test |   64 -------------------
 lipoit/Makefile                |   18 ------
 lipoit/lipo-r.sh               |   53 ----------------
 7 files changed, 0 insertions(+), 503 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index b4a328e..e739d7c 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -208,19 +208,11 @@ osx_ver()
 # been tested much on 10.5 and not all dependent packages are ready
 # for it (including ige-mac-integration).
 #
-# If you want to build more than one architecture, don't use setup_sdk
-# directly: Use setup_universal (see below) instead.
-#
 # 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.
 #
-# There's also one Apple issue: /usr/lib/libiconv.dylib doesn't define
-# a symbol that glib needs in the x86_64 image *only*, so if you're
-# building a 64-bit image, either standalone or as part of a universal
-# binary, you need to build gettext-fw before meta-gtk-osx-bootstrap.
-#
 def setup_sdk(target, sdk_version, architectures=[_default_arch]):
 
     os.environ["MACOSX_DEPLOYMENT_TARGET"] = target
@@ -465,76 +457,6 @@ def setup_ppc_build():
     append_autogenargs("libdbi", _ppc_args)
     append_autogenargs("libdbi-drivers", _ppc_args)
 
-# This is the function to call to build universal binaries. By default
-# it will build a ppc/i386/x86_64 universal binary for 10.5 and
-# 10.6. Arguments are the same as for setup_sdk, but with different
-# names. See the notes on 64-bit compilation at setup_sdk as well.
-def setup_universal_build(target="10.5", sdk_version="10.5",
-                          architectures=['ppc', 'i386', 'x86_64']):
-# No point in attempting the impossible
-    if _osx_version < 5.0:
-        target = "10.4"
-        sdk_version = "10.4u"
-        architectures = ["ppc", "i386"]
-
-    global autogenargs
-    _sdkdir = setup_sdk(target, sdk_version, architectures)
-    if _sdkdir == None:
-        raise Exception("Cross-compiling without specifying an SDK is not supported")
-    _s = " "
-    os.environ["ARCH"] = _s.join(architectures)
-# some dancing around to build only the architectures specified for
-# lipoing together:
-    if ('ppc' not in architectures):
-        skip.append("glib-ppc")
-        skip.append("gtk+-ppc")
-        skip.append("glibmm-ppc")
-    if ('i386' not in architectures):
-        skip.append("glib-i386")
-        skip.append("gtk+-i386")
-        skip.append("glibmm-i386")
-    if ('x86_64' not in architectures):
-        skip.append("glib-x86_64")
-        skip.append("gtk+-x86_64")
-        skip.append("glibmm-x86_64")
-
-
-
-
-    _cflags = '-O1 -ggdb3 -isysroot ' + _sdkdir + ' -mmacosx-version-min=' + target
-    _cxxflags = _cflags
-    _cppflags = '-I' + prefix + '/include -isysroot ' + _sdkdir
-    _ldflags = '-L' + prefix + '/lib -Wl,-syslibroot,' + _sdkdir +' -mmacosx-version-min=' + target
-
-    autogenargs += " --disable-dependency-tracking"
-
-# The rest of the routine prepares and builds the packages that need
-# to be compiled separately and lipoed together.
-
-    _ppc_args = "--build=powerpc-apple-darwin CFLAGS='" + _cflags + " -arch ppc' CXXFLAGS='" + _cxxflags + " 
-arch ppc' LDFLAGS='" + _ldflags + " -arch ppc' NM=nm"
-
-    _i386_args = "--build=i686-apple-darwin CFLAGS='" + _cflags + " -arch i386' CXXFLAGS='" + _cxxflags + " 
-arch i386' LDFLAGS='" + _ldflags + " -arch i386'"
-
-    _x86_64_args = "--build=x86_64-apple-darwin CFLAGS='" + _cflags + " -arch x86_64' CXXFLAGS='" + 
_cxxflags + " -arch x86_64' LDFLAGS='" + _ldflags + " -arch x86_64'"
-
-    append_autogenargs("glib-ppc", _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("glib-i386", _i386_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=no")
-
-    append_autogenargs("glib-x86_64", "--with-libiconv=gnu " + _x86_64_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=no")
-
-    append_autogenargs("gtk-ppc", _ppc_args + " --with-gdktarget=quartz --without-libjasper 
--disable-glibtest gio_can_sniff='yes'")
-
-    append_autogenargs("gtk-i386", _i386_args + "  gio_can_sniff='yes'")
-
-    append_autogenargs("gtk-x86_64", _x86_64_args + " --with-gdktarget=quartz --without-libjasper 
--disable-glibtest gio_can_sniff='yes'")
-
-    skip.append("glibmm")
-    append_autogenargs("glibmm_ppc", _ppc_args)
-    append_autogenargs("glibmm_i386", _i386_args)
-    append_autogenargs("glibmm_x86_64", _x86_64_args)
-
-###### End Setup Universal Build #######
 ###### End Function Definitions  #######
 
 
@@ -702,38 +624,6 @@ append_autogenargs("freetype", 'CFLAGS="$CFLAGS -std=c99"')
 #
 append_autogenargs("gconf", "--enable-static")
 
-# Support prepending frameworks to the setup so they are picked up
-# instead of things from the prefix or /usr.
-#
-_frameworks = os.environ.get("JHB_PREPEND_FRAMEWORKS", "")
-for _framework in _frameworks.split(":"):
-    if _framework != "" and os.path.exists(_framework):
-        # Use prependpath to ensure our paths are added in front of
-        # the ones jhbuild sets up.
-        if os.path.exists(_framework + "/Headers"):
-            prependpath("C_INCLUDE_PATH", _framework + "/Headers")
-            prependpath("CPLUS_INCLUDE_PATH", _framework + "/Headers")
-        if os.path.exists(_framework + "/Resources/dev/bin"):
-            prependpath("PATH", _framework + "/Resources/dev/bin")
-        if os.path.exists(_framework + "/Resources/dev/lib/pkgconfig"):
-            prependpath("PKG_CONFIG_PATH", _framework + "/Resources/dev/lib/pkgconfig")
-        if os.path.exists(_framework + "/Resources/dev/lib"):
-            # FIXME: Need fix in jhbuild for this to work:
-            #prependpath("LDFLAGS", "-L" + _framework + "/Resources/dev/lib")
-            environ_prepend("LDFLAGS", "-L" + _framework + "/Resources/dev/lib", " ")
-        if os.path.exists(_framework + "/Resources/dev/share/aclocal"):
-            prependpath("ACLOCAL_FLAGS", _framework + "/Resources/dev/share/aclocal")
-
-
-# We do some crude extra argument parsing just to add support for
-# getting environment variables. Used in framework creation to pick up
-# the jhbuild prefix.
-#
-#_value = parse_custom_argument("getenv")
-#if _value:
-#    print os.environ.get(_value, "")
-#    raise SystemExit
-
 if _build:
     if "shell" in sys.argv:
         print "Build setup: %s, prefix: %s" % (_build, prefix)