[gtk-osx] Libxml2 needs python in-tree in order to build successfully.

[John Ralls <jralls src gnome org>]

commit c8f1575a779e964ea51db03d63fd39a02ae0ed5e
Author: John Ralls <jralls ceridwen us>
Date:   Sat Nov 3 16:28:53 2012 -0700

    Libxml2 needs python in-tree in order to build successfully.
    
    
    Because the links in the SDKs are screwed up so configure always finds /usr/bin/python, but then can't link to it because sysroot points into the SDK.

 modulesets-stable/gtk-osx-bootstrap.modules   |   10 +++++++++-
 modulesets-unstable/gtk-osx-bootstrap.modules |    8 ++++++++
 modulesets/gtk-osx-bootstrap.modules          |   16 +++++++++++++---
 3 files changed, 30 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 1413ba0..0eb1a82 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -49,11 +49,19 @@
     </dependencies>
   </autotools>
 
+<!-- The python package is in gtk-osx-python.modules. If you're
+     building "native" you can safely add python to the skip list, but
+     otherwise the links in the SDKs are messed up and libxml's python
+     module won't link. In case you're wondering, gnome-doc-utils
+     needs libxml2's python module. -->
   <autotools id="libxml2" autogen-sh="configure">
-    <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
+   <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
 	    repo="xmlsoft.org">
       <patch file="///Users/john/Development/GTK-OSX/gtk-osx-build/patches/libxml2-Bug-686118-pthreads_once_init.patch" strip="1"/>
     </branch>
+    <dependencies>
+      <dep package="python"/>
+    </dependencies>
   </autotools>
 
   <autotools id="libxslt" autogen-sh="configure">
diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
index 8ad1e82..71e05c6 100644
--- a/modulesets-unstable/gtk-osx-bootstrap.modules
+++ b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -47,9 +47,17 @@
     </dependencies>
   </autotools>
 
+<!-- The python package is in gtk-osx-python.modules. If you're
+     building "native" you can safely add python to the skip list, but
+     otherwise the links in the SDKs are messed up and libxml's python
+     module won't link. In case you're wondering, gnome-doc-utils
+     needs libxml2's python module. -->
   <autotools id="libxml2" autogen-sh="configure">
     <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
 	    repo="xmlsoft.org"/>
+    <dependencies>
+      <dep package="python"/>
+    </dependencies>
   </autotools>
 
   <autotools id="libxslt" autogen-sh="configure">
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 4003bcd..c300cfc 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -47,13 +47,23 @@
     </dependencies>
   </autotools>
 
+ <!-- The python package is in gtk-osx-python.modules. If you're
+     building "native" you can safely add python to the skip list, but
+     otherwise the links in the SDKs are messed up and libxml's python
+     module won't link. In case you're wondering, gnome-doc-utils
+     needs libxml2's python module. -->
   <autotools id="libxml2" autogen-sh="configure">
-    <branch version="2.7.8" module="libxml2-2.7.8.tar.gz"
-	    repo="xmlsoft.org"/>
+   <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
+	    repo="xmlsoft.org">
+      <patch file="///Users/john/Development/GTK-OSX/gtk-osx-build/patches/libxml2-Bug-686118-pthreads_once_init.patch" strip="1"/>
+    </branch>
+    <dependencies>
+      <dep package="python"/>
+    </dependencies>
   </autotools>
 
   <autotools id="libxslt" autogen-sh="configure">
-    <branch version="1.1.26" module="libxslt-1.1.26.tar.gz"
+    <branch version="1.1.27" module="libxslt-1.1.27.tar.gz"
 	    repo="xmlsoft.org"/>
     <dependencies>
       <dep package="libxml2"/>