1 Restore --system-site-packages when system virtualenv gets 1.7 upgrade
3 --- a/mozilla/configure.in~ 2013-02-15 22:14:45.000000000 +0100
4 +++ a/mozilla/configure.in 2013-02-20 17:05:55.258742791 +0100
6 PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
9 - PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
10 + PYTHON=/usr/bin/python
14 --- a/mozilla/configure~ 2013-02-15 22:15:48.000000000 +0100
15 +++ a/mozilla/configure 2013-02-20 17:06:11.479134735 +0100
17 PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe
20 - PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
21 + PYTHON=/usr/bin/python
25 --- iceweasel-19.0/mozilla/configure.in~ 2013-02-20 17:11:35.849980531 +0100
26 +++ iceweasel-19.0/mozilla/configure.in 2013-02-20 17:18:24.806617099 +0100
28 AC_MSG_ERROR([python was not found in \$PATH])
31 -AC_MSG_RESULT([Creating Python environment])
32 -dnl This verifies our Python version is sane and ensures the Python
33 -dnl virtualenv is present and up to date. It sanitizes the environment
34 -dnl for us, so we don't need to clean anything out.
35 -$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
36 - $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
38 dnl Create a virtualenv where we can install local Python packages
41 --- iceweasel-19.0/mozilla/configure~ 2013-02-20 17:11:35.853313949 +0100
42 +++ iceweasel-19.0/mozilla/configure 2013-02-20 17:17:59.639339399 +0100
43 @@ -1335,10 +1335,6 @@
44 { echo "configure: error: python was not found in \$PATH" 1>&2; exit 1; }
47 -echo "$ac_t""Creating Python environment" 1>&6
48 -$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
49 - $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
53 PYTHON=`cd $MOZ_BUILD_ROOT && pwd -W`/_virtualenv/Scripts/python.exe