jhbuild r2597 - in trunk: . modulesets patches

[fpeters svn gnome org]

Author: fpeters
Date: Tue Dec 23 20:00:03 2008
New Revision: 2597
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2597&view=rev

Log:
* modulesets/bootstrap.modules, patches/python-2.5.2-lib64.patch:
reenabled python patch, after the removal of a Mandriva specific
part.



Modified:
   trunk/ChangeLog
   trunk/modulesets/bootstrap.modules
   trunk/patches/python-2.5.2-lib64.patch

Modified: trunk/modulesets/bootstrap.modules
==============================================================================
--- trunk/modulesets/bootstrap.modules	(original)
+++ trunk/modulesets/bootstrap.modules	Tue Dec 23 20:00:03 2008
@@ -78,6 +78,7 @@
     <branch repo="python"
 	    module="2.5.2/Python-2.5.2.tar.bz2" version="2.5.2"
 	    size="9807597" md5sum="afb5451049eda91fbde10bd5a4b7fadc">
+      <patch file="python-2.5.2-lib64.patch" strip="1" />
     </branch>
   </autotools>
 

Modified: trunk/patches/python-2.5.2-lib64.patch
==============================================================================
--- trunk/patches/python-2.5.2-lib64.patch	(original)
+++ trunk/patches/python-2.5.2-lib64.patch	Tue Dec 23 20:00:03 2008
@@ -208,16 +208,6 @@
          if standard_lib:
              return libpython
          else:
-@@ -187,7 +191,8 @@
-     if python_build:
-         inc_dir = argv0_path
-     else:
--        inc_dir = get_python_inc(plat_specific=1)
-+        prefix = EXEC_PREFIX or PREFIX
-+        inc_dir = os.path.join(prefix, "include", "multiarch-" + sys.arch + "-linux", "python" + sys.version[:3])
-     if get_python_version() < '2.2':
-         config_h = 'config.h'
-     else:
 diff -Naur Python-2.5.2.orig/Lib/distutils/tests/test_install.py Python-2.5.2/Lib/distutils/tests/test_install.py
 --- Python-2.5.2.orig/Lib/distutils/tests/test_install.py	2008-12-04 12:53:20.870370919 +0100
 +++ Python-2.5.2/Lib/distutils/tests/test_install.py	2008-12-04 12:54:55.365365533 +0100