commit de1d8f85f4a9aa0e84505703b379bb4be7d20774 Author: Mike Perry mikeperry-git@torproject.org Date: Thu Nov 14 18:42:47 2013 -0800

Only build Python 2.7 for FF24.

It seems to fetch extra junk for FF17. --- gitian/descriptors/linux/gitian-firefox.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 19e359f..6ef807a 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -24,6 +24,7 @@ packages: - "libiw-dev" - "hardening-wrapper" - "libgstreamer-plugins-base0.10-dev" +- "versions" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/tor-browser.git" @@ -34,6 +35,7 @@ files: - "dzip.sh" - "python.tar.bz2" script: | + source versions INSTDIR="$HOME/install" export LIBRARY_PATH="$INSTDIR/lib" export CFLAGS="-frandom-seed=tor" @@ -60,13 +62,15 @@ script: | # # Fx 24 ESR does not work with Python < 2.7 anymore. But 10.04 does only ship # with Python 2.6. Thus, we compile 2.7 ourselves... - mkdir python - cd python - tar -xjvf ../python.tar.bz2 - Python-*/configure - make - sudo make install - cd .. + if [ ${TORBROWSER_VERSION::3} != "3.0" ]; then + mkdir python + cd python + tar -xjvf ../python.tar.bz2 + Python-*/configure + make + sudo make install + cd .. + fi # cd tor-browser grep -v '^pref("torbrowser.version",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed