From f645547c736e6487216a5a31710e566d64bd3a79 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Sat, 8 Feb 2020 03:26:42 -0500 Subject: [PATCH] Bump BB, update `download_sources.jl` for new `cleanup_merged_object()` Also try registering `bsdiff` again --- .ci/Manifest.toml | 2 +- .ci/download_sources.jl | 2 +- B/bsdiff/build_tarballs.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Manifest.toml b/.ci/Manifest.toml index 4903d45640d..550a49f35f1 100644 --- a/.ci/Manifest.toml +++ b/.ci/Manifest.toml @@ -16,7 +16,7 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" [[BinaryBuilder]] deps = ["Base64", "Dates", "GitHub", "HTTP", "InteractiveUtils", "JLD2", "JSON", "LibGit2", "Libdl", "MbedTLS", "ObjectFile", "Pkg", "PkgLicenses", "ProgressMeter", "REPL", "Random", "Registrator", "RegistryTools", "SHA", "Sockets", "UUIDs", "ghr_jll"] -git-tree-sha1 = "1be52cdb1100dab354566410fd6a1170391d4288" +git-tree-sha1 = "649263f16bb4d1ff1ec32ebe488233c95787c594" repo-rev = "master" repo-url = "https://github.com/JuliaPackaging/BinaryBuilder.jl.git" uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae" diff --git a/.ci/download_sources.jl b/.ci/download_sources.jl index a38954bfa5b..b6bb91dde33 100644 --- a/.ci/download_sources.jl +++ b/.ci/download_sources.jl @@ -14,7 +14,7 @@ merged = BinaryBuilder.merge_json_objects(objs) BinaryBuilder.cleanup_merged_object!(merged) # Download all sources -download_source.(sourcify.(merged["sources"]); verbose=true) +download_source.(merged["sources"]; verbose=true) # Also initialize JLL package directories src_name = merged["name"] diff --git a/B/bsdiff/build_tarballs.jl b/B/bsdiff/build_tarballs.jl index abd85c2f946..9b0e40b641e 100644 --- a/B/bsdiff/build_tarballs.jl +++ b/B/bsdiff/build_tarballs.jl @@ -17,7 +17,7 @@ cd bsdiff-64ad986cb7bfa8b9145a2d48cd95986660b35d53/ ./autogen.sh export CPPFLAGS="-I${prefix}/include" ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} -make +make -j${nproc} make install """