Verified Commit 24cdd7e4 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41647: Use multi-threaded xz compression.

parent 615e9a14

projects/firefox/build

+0 −8
Changes for projects/firefox/build: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -129,14 +129,6 @@ echo "Starting ./mach build $(date)" 
    export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns

  [% END -%]



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

    # Compression differs with 1 or 2+ threads,

    # so we'll want to have at least 2 threads, but otherwise respect num_procs.

    #

    # Without this, compression takes 20min+

    export XZ_DEFAULTS="-T[% c("num_procs") > 1 ? c("num_procs") : '2' %]"

  [% END -%]



  # Package the browser and also create all the test artifacts.

  #

  # MOZ_SIMPLE_PACKAGE_NAME will force all artifact files to start with "target",

rbm.conf

+4 −2
Changes for rbm.conf: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -261,9 +261,11 @@ var: 
    [% IF c("container/global_disable") -%]

      rm -Rf /var/tmp/build /var/tmp/dist

    [% END -%]

    # Single vs multi-threaded might produce different results, so force at

    # least two threads for reproducibility purposes.

    export XZ_DEFAULTS="-T[% c("num_procs") > 1 ? c("num_procs") : '2' %]"

    [% IF c("compress_tar") == 'zst' -%]

      # Always set ZSTD_NBTHREADS > 1 to make archives reproducible

      # (single vs multi-threaded might produce different results)

      # Same as xz.

      export ZSTD_NBTHREADS=[% c("num_procs") > 1 ? c("num_procs") : '2' %]

    [% END -%]