Commit 66a0ab02 authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 29235: Build our own version of python3.6 

The build of HTTPS-Everywhere requires python3.6, however the python3.6
package which we were using has now been removed from Debian Unstable.

We now build python 3.6 ourselves. As the different platforms use a
different suite by default, we add the common-stretch target to
rbm.conf, which we use to avoid building a different python for each
platform.
parent 929c3f8d

keyring/python.gpg

0 → 100644
+4.2 KiB

File added.

No diff preview for this file type.

View file

projects/debootstrap-image/config

+0 −7
Original line number Diff line number Diff line
@@ -100,13 +100,6 @@ targets: 
        suite: jessie

        arch: i386



  buster-amd64:

    var:

      minimal_apt_version: '1.8.0~alpha3.1'

      container:

        suite: buster

        arch: amd64



  stretch-amd64:

    var:

      minimal_apt_version: 1.4.9

projects/https-everywhere/build

+1 −0
Original line number Diff line number Diff line 
#!/bin/bash

[% c("var/set_default_env") -%]

[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]

tar xf [% project %]-[% c('version') %].tar.gz

cd [% project %]-[% c('version') %]

./make.sh

projects/https-everywhere/config

+6 −3
Original line number Diff line number Diff line
@@ -10,18 +10,17 @@ var: 
  # HTTPS Everywhere is expected to be the same on all platforms. To avoid

  # building the same thing 4 times, using 4 different container images

  # (each one with a different suite or architecture), we set the container

  # to buster/amd64 for all platforms. This allows us to create only one

  # to stretch/amd64 for all platforms. This allows us to create only one

  # container image, and also build the extension only one time as the

  # filename does not contain the platform, and var/build_id should be

  # the same since there is now nothing platform specific in the build

  # inputs. This allows us to save a little time and disk space.

  container:

    use_container: 1

    suite: buster

    suite: stretch

    arch: amd64

  deps:

    - git

    - python3.6

    - libxslt1.1

    - libxml2-utils

    - sqlite3
@@ -31,3 +30,7 @@ var: 


input_files:

  - project: container-image

  - project: python

    name: python

    target:

      - common-stretch

projects/python/build

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#!/bin/bash

[% c("var/set_default_env") -%]

distdir=/var/tmp/dist/[% project %]

mkdir -p $distdir

tar xf [% c('input_files_by_name/python') %]

cd Python-[% c('version') %]

./configure --prefix=$distdir

make -j[% c("buildconf/num_procs") %]

make prefix=$distdir install

cd /var/tmp/dist

[% c('tar', {

	tar_src => 'python',

	tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),

    }) %]