Update BinaryBuilderBase (#972)

* Update for latest changes in BinaryBuilderBase

* Test Rust 1.43

Author: giordano

Manifest.toml

@@ -28,7 +28,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[BinaryBuilderBase]]
 deps = ["CodecZlib", "Downloads", "InteractiveUtils", "JSON", "LibGit2", "Libdl", "Logging", "OutputCollectors", "Pkg", "Random", "SHA", "SimpleBufferStream", "TOML", "Tar", "UUIDs", "p7zip_jll"]
-git-tree-sha1 = "5df61db5de60080b894f1e1d00460d4490e4f422"
+git-tree-sha1 = "670fa00c09d08e4d78dd592cdfdf440161d5d951"
 repo-rev = "master"
 repo-url = "https://github.com/JuliaPackaging/BinaryBuilderBase.jl.git"
 uuid = "7f725544-6523-48cd-82d1-3fa08ff4056e"
@@ -85,9 +85,9 @@ version = "0.1.6"
 
 [[GitHub]]
 deps = ["Base64", "Dates", "HTTP", "JSON", "MbedTLS", "Sockets"]
-git-tree-sha1 = "587c993cedac5707f72ce082f4f33d525e80ac40"
+git-tree-sha1 = "599dec6adb9f1b73b9c31c9cd4302a01d2575d81"
 uuid = "bc5e4493-9b4d-5f90-b8aa-2b2bcaad7a26"
-version = "5.1.8"
+version = "5.2.0"
 
 [[HTTP]]
 deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]

azure-pipelines.yml

@@ -23,11 +23,13 @@ jobs:
     clean: true
   - bash: |
       set -e
+      $(JULIA) -e 'using Pkg; Pkg.instantiate()'
       $(JULIA) -e 'using BinaryBuilder; BinaryBuilder.versioninfo()'
       $(JULIA) -e 'using Pkg; Pkg.status()'
     name: SystemInfo
 
 - job: Test
+  dependsOn: Info
   timeoutInMinutes: 360
   strategy:
     matrix:

src/auditor/compiler_abi.jl

@@ -173,7 +173,7 @@ function cppfilt(symbol_names::Vector, platform::AbstractPlatform)
     output = IOBuffer()
     mktempdir() do dir
         ur = preferred_runner()(dir; cwd="/workspace/", platform=platform)
-        run_interactive(ur, `/opt/bin/c++filt`; stdin=input, stdout=output)
+        run_interactive(ur, `/opt/bin/$(triplet(ur.platform))/c++filt`; stdin=input, stdout=output)
     end
 
     return filter!(s -> !isempty(s), split(String(take!(output)), "\n"))

src/auditor/dynamic_linkage.jl

@@ -303,7 +303,7 @@ function relink_to_rpath(prefix::Prefix, platform::AbstractPlatform, path::Abstr
     relink_cmd = ``
 
     if Sys.isapple(platform)
-        install_name_tool = "/opt/bin/install_name_tool"
+        install_name_tool = "/opt/bin/$(triplet(ur.platform))/install_name_tool"
         relink_cmd = `$install_name_tool -change $(old_libpath) @rpath/$(libname) $(rel_path)`
     elseif Sys.islinux(platform) || Sys.isbsd(platform)
         patchelf = "/usr/bin/patchelf"
@@ -340,7 +340,7 @@ function fix_identity_mismatch(prefix::Prefix, platform::AbstractPlatform, path:
     end
 
     ur = preferred_runner()(prefix.path; cwd="/workspace/", platform=platform)
-    install_name_tool = "/opt/bin/install_name_tool"
+    install_name_tool = "/opt/bin/$(triplet(ur.platform))/install_name_tool"
     id_cmd = `$install_name_tool -id $(new_id) $(rel_path)`
 
     # Create a new linkage that looks like @rpath/$lib on OSX, 
@@ -374,7 +374,7 @@ function update_linkage(prefix::Prefix, platform::AbstractPlatform, path::Abstra
     add_rpath = x -> ``
     relink = (x, y) -> ``
     patchelf = "/usr/bin/patchelf"
-    install_name_tool = "/opt/bin/install_name_tool"
+    install_name_tool = "/opt/bin/$(triplet(ur.platform))/install_name_tool"
     if Sys.isapple(platform)
         normalize_rpath = rp -> begin
             if !startswith(rp, "@loader_path")

src/auditor/soname_matching.jl

@@ -67,7 +67,7 @@ function ensure_soname(prefix::Prefix, path::AbstractString, platform::AbstractP
     set_soname_cmd = ``
 
     if Sys.isapple(platform)
-        install_name_tool = "/opt/bin/install_name_tool"
+        install_name_tool = "/opt/bin/$(triplet(ur.platform))/install_name_tool"
         set_soname_cmd = `$install_name_tool -id $(soname) $(rel_path)`
     elseif Sys.islinux(platform) || Sys.isbsd(platform)
         patchelf = "/usr/bin/patchelf"