[tor-commits] [tor-messenger-build/master] Don't build python: the Wheezy version is recent enough

[boklm at torproject.org]

commit ef0675501bf8e2aae082e009b4cedb50a4f1e325
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Sep 10 23:56:57 2015 +0200

    Don't build python: the Wheezy version is recent enough
---
 projects/instantbird/build  |    2 --
 projects/instantbird/config |    3 ---
 projects/python/build       |   15 ---------------
 projects/python/config      |   22 ----------------------
 4 files changed, 42 deletions(-)

diff --git a/projects/instantbird/build b/projects/instantbird/build
index a422cce..7870dd6 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -11,8 +11,6 @@ ln -s /var/tmp/dist/gcc/bin/gcc /var/tmp/dist/gcc/bin/cc
 mkdir -p /var/tmp/dist
 cd /var/tmp/dist
 [% IF c("var/linux") -%]
-tar xf $rootdir/[% c('input_files_by_name/python') %]
-export PATH="/var/tmp/dist/python/bin:$PATH"
 tar xf $rootdir/[% c('input_files_by_name/binutils') %]
 export PATH="/var/tmp/dist/binutils/bin:$PATH"
 [% END -%]
diff --git a/projects/instantbird/config b/projects/instantbird/config
index e64a674..5681e6f 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -125,9 +125,6 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
-  - name: python
-    project: python
-    enable: '[% c("var/linux") %]'
   - name: binutils
     project: binutils
     enable: '[% c("var/linux") %]'
diff --git a/projects/python/build b/projects/python/build
deleted file mode 100644
index e27d06a..0000000
--- a/projects/python/build
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-rootdir=$(pwd)
-distdir=/var/tmp/dist/python
-mkdir -p $distdir
-tar xf [% c('input_files_by_name/python') %]
-cd Python-[% c('version') %]
-./configure --prefix=$distdir
-make -j4
-make prefix=$distdir install
-cd /var/tmp/dist
-[% c('tar', {
-	tar_src => 'python',
-	tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
-    }) %]
diff --git a/projects/python/config b/projects/python/config
deleted file mode 100644
index 9c21725..0000000
--- a/projects/python/config
+++ /dev/null
@@ -1,22 +0,0 @@
-# vim: filetype=yaml sw=2
-version: 2.7.8
-filename: 'python-[% c("lsb_release/id") %]-[% c("lsb_release/codename") %]-[% c("var/build_id") %].tar.gz'
-lsb_release:
-  id: Debian
-  release: 7.8
-  codename: wheezy
-remote_docker: 1
-var:
-  deps:
-    - xz-utils
-    - build-essential
-    - python-all
-    - zlib1g-dev
-    - libssl-dev
-input_files:
-  - name: python
-    URL: 'https://www.python.org/ftp/python/[% c("version") %]/Python-[% c("version") %].tar.xz'
-    gpg_keyring: python.gpg
-    sig_ext: asc
-    file_gpg_id: 1
-  - project: docker-image