Merge branch 'osx-fixes' of git://github.com/mathstuf/spack into mathstuf-osx-fixes

var/spack/repos/builtin/packages/pkg-config/package.py

@@ -10,7 +10,12 @@ class PkgConfig(Package):
     parallel = False
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" %prefix, "--enable-shared")
+        configure("--prefix=%s" %prefix,
+                "--enable-shared",
+                "--with-internal-glib") # There's a bootstrapping problem here;
+                                        # glib uses pkg-config as well, so
+                                        # break the cycle by using the internal
+                                        # glib.
 
         make()
         make("install")

var/spack/repos/builtin/packages/py-matplotlib/package.py

@@ -26,6 +26,7 @@ class PyMatplotlib(Package):
     depends_on('py-pbr')
     depends_on('py-funcsigs')
 
+    depends_on('pkg-config')
     depends_on('freetype')
     depends_on('qt', when='+gui')
     depends_on('bzip2')

var/spack/repos/builtin/packages/py-setuptools/package.py

@@ -5,13 +5,13 @@ class PySetuptools(Package):
     homepage = "https://pypi.python.org/pypi/setuptools"
     url      = "https://pypi.python.org/packages/source/s/setuptools/setuptools-11.3.tar.gz"
 
-    version('11.3.1', '01f69212e019a2420c1693fb43593930')
-    version('16.0', '0ace0b96233516fc5f7c857d086aa3ad')
-    version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06')
-    version('19.2', '78353b1f80375ca5e088f4b4627ffe03')
-    version('20.5', 'fadc1e1123ddbe31006e5e43e927362b')
-    version('20.6.7', '45d6110f3ec14924e44c33411db64fe6')
     version('20.7.0', '5d12b39bf3e75e80fdce54e44b255615')
+    version('20.6.7', '45d6110f3ec14924e44c33411db64fe6')
+    version('20.5', 'fadc1e1123ddbe31006e5e43e927362b')
+    version('19.2', '78353b1f80375ca5e088f4b4627ffe03')
+    version('18.1', 'f72e87f34fbf07f299f6cb46256a0b06')
+    version('16.0', '0ace0b96233516fc5f7c857d086aa3ad')
+    version('11.3.1', '01f69212e019a2420c1693fb43593930')
 
     extends('python')