boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build

Commits:

14 changed files:

Changes:

  • projects/android-components/config
    ... ... @@ -19,8 +19,6 @@ var:
    19 19 
       gradle_version: 7.0.2
    20 20 
       glean_parser: 5.0.1
    21 21 
       git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'
    22 
    -  arch_deps:
    23 
    -    - python3-venv
    24 22
    25 23 
     targets:
    26 24 
       nightly:

  • projects/android-toolchain/config
    ... ... @@ -8,9 +8,6 @@ var:
    8 8 
       version_30: 30.0.2
    9 9 
       version_29: 29.0.2
    10 10 
       version_28: 28.0.3
    11 
    -  deps:
    12 
    -    - unzip
    13 
    -    - python3
    14 11 
       setup: |
    15 12 
         mkdir -p /var/tmp/dist
    16 13 
         tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]

  • projects/application-services/config
    ... ... @@ -13,8 +13,6 @@ var:
    13 13 
       gradle_dependencies_version: 9
    14 14 
       gradle_version: 6.7.1
    15 15 
       glean_parser: 4.0.0
    16 
    -  arch_deps:
    17 
    -    - python3-venv
    18 16
    19 17 
     input_files:
    20 18 
       - project: container-image

  • projects/bison/config
    ... ... @@ -3,9 +3,6 @@ version: 3.8.2
    3 3 
     filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
    4 4 
     container:
    5 5 
       use_container: 1
    6 
    -  deps:
    7 
    -    - build_essential
    8 
    -    - xz-utils
    9 6
    10 7 
     input_files:
    11 8 
       - URL: https://ftp.gnu.org/gnu/bison/bison-[% c("version") %].tar.xz

  • projects/browser/config
    ... ... @@ -17,12 +17,16 @@ var:
    17 17 
         - patch
    18 18
    19 19 
     targets:
    20 
    -  linux-i686:
    20 
    +  linux:
    21 21 
         var:
    22 
    -      mar_osname: linux32
    23 22 
           arch_deps:
    24 
    -        # Install libc6-i386 to be able to run 32bit mar tools (bug 29812)
    23 
    +        # Install libc6-i386 to be able to run 32bit mar tools in linux-i686
    24 
    +        # builds (bug 29812). We don't need it in x86_64 builds, but we
    25 
    +        # share the container to reduce space used.
    25 26 
             - libc6-i386
    27 
    +  linux-i686:
    28 
    +    var:
    29 
    +      mar_osname: linux32
    26 30 
       linux-x86_64:
    27 31 
         var:
    28 32 
           mar_osname: linux64

  • projects/fenix/config
    ... ... @@ -20,8 +20,6 @@ var:
    20 20 
       gradle_dependencies_version: 37
    21 21 
       gradle_version: 7.0.2
    22 22 
       glean_parser: 5.0.1
    23 
    -  arch_deps:
    24 
    -    - python3-venv
    25 23
    26 24 
     targets:
    27 25 
       release:

  • projects/gradle/config
    ... ... @@ -5,8 +5,6 @@ container:
    5 5 
       use_container: 1
    6 6
    7 7 
     var:
    8 
    -  deps:
    9 
    -    - unzip
    10 8 
       gradle_sha256sum:
    11 9 
         5.1.1: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
    12 10 
         5.6.4: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d

  • projects/libevent/config
    ... ... @@ -12,10 +12,6 @@ var:
    12 12 
       configure_opt_project: --disable-static
    13 13
    14 14 
     targets:
    15 
    -  macos:
    16 
    -    var:
    17 
    -      arch_deps:
    18 
    -        - faketime
    19 15 
       windows:
    20 16 
         var:
    21 17 
           configure_opt_project: --disable-shared

  • projects/rust/config
    ... ... @@ -7,23 +7,10 @@ container:
    7 7 
     targets:
    8 8 
       android:
    9 9 
         var:
    10 
    -      arch_deps:
    11 
    -        - libssl-dev
    12 
    -        - pkg-config
    13 
    -        - zlib1g-dev
    14 10 
           configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,armv7-linux-androideabi,thumbv7neon-linux-androideabi,aarch64-linux-android,i686-linux-android,x86_64-linux-android --set=target.armv7-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.armv7-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.thumbv7neon-linux-androideabi.cc=armv7a-linux-androideabi16-clang --set=target.thumbv7neon-linux-androideabi.ar=armv7a-linux-androideabi-ar --set=target.aarch64-linux-android.cc=aarch64-linux-android21-clang --set=target.aarch64-linux-android.ar=aarch64-linux-android-ar --set=target.i686-linux-android.cc=i686-linux-android16-clang --set=target.i686-linux-android.ar=i686-linux-android-ar --set=target.x86_64-linux-android.cc=x86_64-linux-android21-clang --set=target.x86_64-linux-android.ar=x86_64-linux-android-ar
    15 11
    16 12 
       linux:
    17 13 
         var:
    18 
    -      deps:
    19 
    -        - libc6-dev-i386
    20 
    -        - lib32stdc++6
    21 
    -        - build-essential
    22 
    -        - python
    23 
    -        - automake
    24 
    -        - libssl-dev
    25 
    -        - pkg-config
    26 
    -        - hardening-wrapper
    27 14 
           # We use
    28 15 
           # `--enable-local-rust` to avoid downloading the required compiler during
    29 16 
           # build time
    ... ... @@ -58,21 +45,17 @@ targets:
    58 45
    59 46 
       macos:
    60 47 
         var:
    48 
    +      configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
    61 49 
           arch_deps:
    62 
    -        - libssl-dev
    63 50 
             - pkg-config
    64 
    -        - zlib1g-dev
    65 
    -      configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/macosx-toolchain/clang --set rust.jemalloc --target=x86_64-unknown-linux-gnu,[% c("var/build_target") %] --set=target.[% c("var/build_target") %].cc=[% c("var/build_target") %]-clang --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
    66 51
    67 52 
       windows:
    68 53 
         var:
    69 
    -      arch_deps:
    70 
    -        - libssl-dev
    71 
    -        - pkg-config
    72 
    -        - zlib1g-dev
    73 54 
           # See tor-browser-build#29320
    74 55 
           compiler: mingw-w64
    75 56 
           configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --llvm-root=/var/tmp/dist/clang --target=x86_64-unknown-linux-gnu,[% c("arch") %]-pc-windows-gnu --set target.x86_64-unknown-linux-gnu.linker=clang --set target.x86_64-unknown-linux-gnu.ar=llvm-ar --set target.x86_64-unknown-linux-gnu.ranlib=llvm-ranlib
    57 
    +      arch_deps:
    58 
    +        - pkg-config
    76 59
    77 60 
     input_files:
    78 61 
       - project: container-image

  • projects/tor-android-service/config
    ... ... @@ -8,9 +8,6 @@ container:
    8 8 
       use_container: 1
    9 9
    10 10 
     var:
    11 
    -  deps:
    12 
    -    - build-essential
    13 
    -    - unzip
    14 11 
       # this should be updated when the list of gradle dependencies is changed
    15 12 
       gradle_dependencies_version: 5
    16 13 
       gradle_version: 5.6.4

  • projects/tor-onion-proxy-library/config
    ... ... @@ -8,10 +8,6 @@ container:
    8 8 
       use_container: 1
    9 9
    10 10 
     var:
    11 
    -  deps:
    12 
    -    - build-essential
    13 
    -    - unzip
    14 
    -    - zip
    15 11 
       # this should be updated when the list of gradle dependencies is changed
    16 12 
       gradle_dependencies_version: 5
    17 13 
       gradle_version: 5.6.4

  • projects/tor/config
    ... ... @@ -9,13 +9,6 @@ tag_gpg_id: 1
    9 9 
     container:
    10 10 
       use_container: 1
    11 11
    12 
    -var:
    13 
    -  deps:
    14 
    -    - build-essential
    15 
    -    - automake
    16 
    -    - zip
    17 
    -    - unzip
    18 
    -
    19 12 
     targets:
    20 13 
       nightly:
    21 14 
         version: '[% c("abbrev") %]'
    ... ... @@ -27,25 +20,15 @@ targets:
    27 20 
           libdir: lib32
    28 21 
           sort_deps: 0
    29 22 
           arch_deps:
    30 
    -        - libtool
    31 23 
             - zlib1g-dev:i386
    32 
    -        - hardening-wrapper
    33 24 
       linux-x86_64:
    34 25 
         var:
    35 26 
           libdir: lib64
    36 27 
           arch_deps:
    37 
    -        - libtool
    38 28 
             - zlib1g-dev
    39 
    -        - hardening-wrapper
    40 
    -  macos:
    41 
    -    var:
    42 
    -      arch_deps:
    43 
    -        - faketime
    44 29 
       android:
    45 30 
         var:
    46 31 
           configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc'
    47 
    -      arch_deps:
    48 
    -        - libtinfo5
    49 32
    50 33 
     input_files:
    51 34 
       - project: container-image

  • projects/wasi-sysroot/config
    ... ... @@ -8,12 +8,6 @@ git_submodule: 1
    8 8 
     container:
    9 9 
       use_container: 1
    10 10
    11 
    -targets:
    12 
    -  linux:
    13 
    -    var:
    14 
    -      arch_deps:
    15 
    -        - patch
    16 
    -
    17 11 
     input_files:
    18 12 
       - project: container-image
    19 13 
       - name: binutils

  • rbm.conf
    ... ... @@ -337,11 +337,15 @@ targets:
    337 337 
             - bison
    338 338 
             - python3
    339 339 
             - python3-distutils
    340 
    +        - python3-venv
    340 341 
             - automake
    341 342 
             - libtool
    342 343 
             - zip
    343 344 
             - unzip
    344 345 
             - libtinfo5
    346 
    +        - libssl-dev
    347 
    +        - pkg-config
    348 
    +        - zlib1g-dev
    345 349 
           configure_opt: '--host=[% c("var/cross_prefix") %] CC=[% c("var/CC") %] [% c("var/configure_opt_project") %]'
    346 350
    347 351 
           pre_pkginst: |
    ... ... @@ -434,6 +438,8 @@ targets:
    434 438 
           deps:
    435 439 
             - libc6-dev-i386
    436 440 
             - lib32stdc++6
    441 
    +        - pkg-config
    442 
    +        - libssl-dev
    437 443 
             - build-essential
    438 444 
             - python
    439 445 
             - bison
    ... ... @@ -442,6 +448,8 @@ targets:
    442 448 
             - libtool
    443 449 
             - zip
    444 450 
             - unzip
    451 
    +        - xz-utils
    452 
    +        - patch
    445 453 
       linux-asan:
    446 454 
         var:
    447 455 
           asan: 1
    ... ... @@ -500,6 +508,8 @@ targets:
    500 508 
             - libtool
    501 509 
             - zip
    502 510 
             - unzip
    511 
    +        - libssl-dev
    512 
    +        - zlib1g-dev
    503 513
    504 514 
       torbrowser-macos:
    505 515 
         - macos-universal
    ... ... @@ -554,6 +564,7 @@ targets:
    554 564 
           rlbox: 0
    555 565 
           deps:
    556 566 
             - build-essential
    567 
    +        - faketime
    557 568 
             - python3
    558 569 
             - python3-distutils
    559 570 
             - automake
    ... ... @@ -561,6 +572,8 @@ targets:
    561 572 
             - libtool
    562 573 
             - zip
    563 574 
             - unzip
    575 
    +        - libssl-dev
    576 
    +        - zlib1g-dev
    564 577 
           faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
    565 578
    566 579 
       # The no_build_id target can be useful if you want to quickly display

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help