Commit 9c1b95ed authored by boklm's avatar boklm Committed by Richard Pospesel
Browse files

Bug 40755: Allow building hfsplus-tools without container 

If clang is insalled, building hfsplus-tools should work without
container.
parent 38b371a3

projects/hfsplus-tools/build

+4 −2
Original line number Diff line number Diff line
@@ -2,8 +2,10 @@ 
[% c("var/set_default_env") -%]

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

mkdir /var/tmp/dist

[% IF ! c("container/global_disable") -%]

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

  export PATH="/var/tmp/dist/clang/bin:$PATH"

[% END -%]



tar -xf diskdev_cmds-[% c("version") %].tar.gz

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

projects/hfsplus-tools/config

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ input_files: 
  # The project uses a flag that is not supported by GCC

  - name: clang

    project: clang

    enable: '[% ! c("container/global_disable") %]'

  # Build only newfs (we do not care of fsck), remove a header that does not

  # exist on Linux (at that path) and is not required on Linux either, and make

  # the UUID deterministic.

tools/signing/gatekeeper-bundling.sh

+3 −3
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ test -f "$libdmg_file" || \ 
             "You can build it with:" \

             "  ./rbm/rbm build --target no_containers libdmg-hfsplus" \

             "See var/deps in projects/libdmg-hfsplus/config for the list of build dependencies"

# hfsplus-tools needs to be compiled with Clang, so its build id might change

hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-*.tar.gz"

hfstools_file="$script_dir/../../out/hfsplus-tools/hfsplus-tools-540.1.linux3-66de66.tar.gz"

test -f "$hfstools_file" || \

  exit_error "$hfstools_file is missing." \

             "You can build it with:" \

             "  ./rbm/rbm build hfsplus-tools --target alpha --target torbrowser-macos-x86_64"

             "  ./rbm/rbm build --target no_containers hfsplus-tools" \

             "You will need the clang and uuid-dev packages installed"



test -d "$macos_signed_dir" || mkdir "$macos_signed_dir"

tmpdir="$macos_stapled_dir/tmp"