Skip to content

Commit

Permalink
Pass through the new Rust and Go version arguments (#1358)
Browse files Browse the repository at this point in the history
* Pass through the new Rust and Go version arguments
* Add version selection to the docs
* Version bump and update BinaryBuilderBase compat (BinaryBuilderBase.jl 1.34 has the new kwargs.)
  • Loading branch information
imciner2 authored Dec 27, 2024
1 parent 44b5ef7 commit f397838
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "BinaryBuilder"
uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
authors = ["Elliot Saba <staticfloat@gmail.com>"]
version = "0.6.2"
version = "0.6.3"

[deps]
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
Expand Down Expand Up @@ -33,7 +33,7 @@ ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"

[compat]
ArgParse = "1.1"
BinaryBuilderBase = "1.33"
BinaryBuilderBase = "1.34"
Downloads = "1"
GitHub = "5.1"
HTTP = "0.8, 0.9, 1"
Expand Down
6 changes: 3 additions & 3 deletions docs/src/build_tips.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Examples of builds performed with Meson include:

## Go builds

The Go toolchain provided by BinaryBuilder can be requested by adding `:go` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :go]`. Go-based packages can usually be built and installed with `go`:
The Go toolchain provided by BinaryBuilder can be requested by adding `:go` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :go]`, and a specific version of the toolchain can be selected by adding the `preferred_go_version` keyword argument to [`build_tarballs`](@ref). Go-based packages can usually be built and installed with `go`:

```sh
go build -o ${bindir}
Expand All @@ -109,7 +109,7 @@ Example of packages using Go:

## Rust builds

The Rust toolchain provided by BinaryBuilder can be requested by adding `:rust` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :rust]`. Rust-based packages can usually be built with `cargo`:
The Rust toolchain provided by BinaryBuilder can be requested by adding `:rust` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :rust]`, and a specific version of the toolchain can be selected by adding the `preferred_rust_version` keyword argument to [`build_tarballs`](@ref). Rust-based packages can usually be built with `cargo`:

```sh
cargo build --release
Expand Down Expand Up @@ -212,7 +212,7 @@ If in your build you need to use a package to a BLAS/LAPACK library you have the
* always use LP64 interface, also on 64-bit systems.
This may be a simpler option if renamining the BLAS/LAPACK symbols is too cumbersome in your case.
In terms of libraries to link to:
- also in this case you can link to `libblastrampoline`, however you _must_ make sure an LP64 BLAS/LAPACK library is backing `libblastrampoline`, otherwise all BLAS/LAPACK calls from the library will result in hard-to-debug segmentation faults, because in this case Julia does not provided a default backing LP64 BLAS/LAPACK library on 64-bit systems
- also in this case you can link to `libblastrampoline`, however you _must_ make sure an LP64 BLAS/LAPACK library is backing `libblastrampoline`, otherwise all BLAS/LAPACK calls from the library will result in hard-to-debug segmentation faults, because in this case Julia does not provided a default backing LP64 BLAS/LAPACK library on 64-bit systems
- alternatively, you can use builds of BLAS/LAPACK libraries which always use LP64 interface also on 64-bit platforms, like the package `OpenBLAS32_jll`.

## Dependencies for the target system vs host system
Expand Down
2 changes: 1 addition & 1 deletion src/AutoBuild.jl
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ function autobuild(dir::AbstractString,
build_path = joinpath(dir, "build", triplet(platform))
mkpath(build_path)

shards = choose_shards(platform; extract_kwargs(kwargs, (:preferred_gcc_version,:preferred_llvm_version,:bootstrap_list,:compilers))...)
shards = choose_shards(platform; extract_kwargs(kwargs, (:preferred_gcc_version,:preferred_llvm_version,:preferred_rust_version,:preferred_go_version,:bootstrap_list,:compilers))...)
concrete_platform = get_concrete_platform(platform, shards)

prefix = setup_workspace(
Expand Down

2 comments on commit f397838

@imciner2
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/122073

Tip: Release Notes

Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.

@JuliaRegistrator register

Release notes:

## Breaking changes

- blah

To add them here just re-invoke and the PR will be updated.

Tagging

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.6.3 -m "<description of version>" f3978382b1ecd4f50d28e6a0f346039fb543bcf6
git push origin v0.6.3

Please sign in to comment.