Unverified Commit c606a927 authored by boklm's avatar boklm
Browse files

Bug 40102: Use Debian Stretch for Linux builds

parent bac08eff

projects/binutils/build

+1 −25
Original line number Diff line number Diff line
@@ -2,17 +2,7 @@ 
[% c("var/set_default_env") -%]

mkdir /var/tmp/dist

distdir=/var/tmp/dist/binutils

[% IF c("var/linux") %]

  # Config options for hardening-wrapper

  export DEB_BUILD_HARDENING=1

  export DEB_BUILD_HARDENING_STACKPROTECTOR=1

  export DEB_BUILD_HARDENING_FORTIFY=1

  export DEB_BUILD_HARDENING_FORMAT=1

  export DEB_BUILD_HARDENING_PIE=1



  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/bison') %]

  export PATH=/var/tmp/dist/bison/bin:$PATH

[% END %]

[% IF c("var/linux"); GET c("var/set_hardened_build_flags"); END %]



tar xf [% project %]-[% c("version") %].tar.xz

cd [% project %]-[% c("version") %]
@@ -23,20 +13,6 @@ cd [% project %]-[% c("version") %] 
make -j[% c("num_procs") %] MAKEINFO=true

make install MAKEINFO=true



# gold is disabled for linux-cross, because of

# https://sourceware.org/bugzilla/show_bug.cgi?id=14995

# Once we upgrade to glibc 2.26, we might be able to enable gold for

# linux-cross.

[% IF c("var/linux") && ! c("var/linux-cross") %]

  # Make sure gold is used with the hardening wrapper for full RELRO, see #13031.

  cd $distdir/bin

  rm ld

  cp /usr/bin/hardened-ld ./

  mv ld.gold ld.gold.real

  ln -sf hardened-ld ld.gold

  ln -sf ld.gold ld

[% END %]



cd /var/tmp/dist

[% c('tar', {

        tar_src => [ project ],

projects/binutils/config

+0 −4
Original line number Diff line number Diff line
@@ -22,7 +22,3 @@ input_files: 
    file_gpg_id: 1

    gpg_keyring: binutils.gpg

  - project: container-image
 
  - project: bison

    name: bison

    # We try to use system's bison, but Jessie's is too old

    enable: '[% c("var/linux") %]'

projects/bison/build

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#!/bin/bash

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

distdir=/var/tmp/dist/bison

tar xf [% project %]-[% c("version") %].tar.xz

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

./configure --prefix=$distdir

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

make install

cd /var/tmp/dist

[% c('tar', {

        tar_src => [ project ],

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

        }) %]

projects/bison/config

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: 3.8.2

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'

container:

  use_container: 1



input_files:

  - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz

    sha256: 9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2

  - project: container-image

projects/cmake/build

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ distdir=/var/tmp/dist/[% project %] 
  [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcc'),

                              hardened_gcc => 0 }) %]

[% END -%]

mkdir /var/tmp/build

mkdir -p /var/tmp/build

tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz

cd /var/tmp/build/[% project %]-[% c('version') %]

./bootstrap --prefix=$distdir