EncapPackages: Changes to get lxml-1.2.1 to work:

  1. Add setuptools-0.6c6
  2. Modifications to Python and all Python modules to work with new setuptools
  3. There is no three


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3328 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 16 insertions, 2 deletions

diff --git a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
index 31b148dcc..db2f764c9 100644
--- a/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
+++ b/encap/src/encap-profiles/bcfg2-python-2.4.4.ep
@@ -8,6 +8,7 @@
 >
 
 <prereq package="m4-1.4.4" />
+<prereq package="patch-2.5.9" />
 <prereq package="bcfg2-zlib-1.2.3" />
 <prereq package="bcfg2-gzip-1.2.4b" />
 <prereq package="bcfg2-pkg-config-0.22" />
@@ -63,6 +64,21 @@ url="http://encapsrcdist/mirror/python/Python-2.4.4.tgz
      http://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz"
 >
 
+<patch options="-p0" from_dir="Lib"><![CDATA[
+--- site.py	2007-06-21 22:26:29.000000000 -0400
++++ site.py	2007-06-21 22:26:55.000000000 -0400
+@@ -170,7 +170,7 @@
+ 
+ def addsitepackages(known_paths):
+     """Add site-packages (and possibly site-python) to sys.path"""
+-    prefixes = [sys.prefix]
++    prefixes = ['/usr/local/lib/bcfg2', sys.prefix]
+     if sys.exec_prefix != sys.prefix:
+         prefixes.append(sys.exec_prefix)
+     for prefix in prefixes:
+
+]]></patch>
+
 <configure>
 if [ -f setup.py.orig ]; then cp setup.py.orig setup.py; fi
 cat setup.py \
@@ -87,8 +103,6 @@ PLATFORM_ENDIF
 # Put setup back into pristine state
 rm ${builddir}/setup.py
 cp ${builddir}/setup.py.orig ${builddir}/setup.py
-# Make site-packages be in the PYTHONPATH
-echo /usr/local/lib/bcfg2/lib/python2.4/site-packages > lib/bcfg2/lib/python2.4/site-packages/usr-local-lib-bcfg2.pth
 # Convienience links
 mkdir bin 2>/dev/null || exit 0
 ln -sf ../lib/bcfg2/bin/pydoc bin/b2-pydoc