Commit 2dfbef2e authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_22242'

parents 4074cbc2 6063d5c6

projects/firefox/build

+5 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ EOF 
  export PATH="/var/tmp/dist/binutils/bin:$PATH"

[% END -%]



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

[% IF c("var/selfrando") -%]

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

  # Selfrando wrapper

  export PATH="/var/tmp/dist/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
@@ -194,6 +194,10 @@ cd $distdir 
      objcopy --only-keep-debug $LIB Debug/$LIB

      strip $LIB

      objcopy --add-gnu-debuglink=./Debug/$LIB $LIB

      [% IF c("var/selfrando") -%]

        # remove RUNPATH added by selfrando (see #22242)

        chrpath -d $LIB

      [% END -%]

  done

[% END %]

projects/firefox/config

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ targets: 
        - libx11-xcb-dev

        # We built GCC but not the libmpc2, thus we need to install it

        - libmpc2

        # needed to remove RUNPATH added by selfrando (see #22242)

        - chrpath

  linux-x86_64:

    var:

      martools_filename: mar-tools-linux64.zip
@@ -83,7 +85,7 @@ input_files: 
    enable: '[% c("var/linux") %]'

  - project: selfrando

    name: selfrando

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

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

  - filename: fix-info-plist.py

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

  - filename: no-dmg.patch

rbm.conf

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ targets: 
      # We only build snowflake for linux on the alpha and nightly channels for now.

      snowflake: '[% c("var/alpha") || c("var/nightly") %]'

      fteproxy: 1

      selfrando: '[% ! c("var/release") %]'

      container:

        suite: wheezy

      deps: