Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge block-sys into block2 #551

Merged
merged 4 commits into from
Jan 7, 2024
Merged

Merge block-sys into block2 #551

merged 4 commits into from
Jan 7, 2024

Conversation

madsmtm
Copy link
Owner

@madsmtm madsmtm commented Jan 7, 2024

Part of #168.

block-sys doesn't actually build a library, it only links to it, so there is no real need for a build script, nor for the links key.

Additionally, it should actually only expose the six public symbols, and in that case, it just seems wasteful to have multiple crates.

This does remove:

  1. The ability to override the linking. This was brittle already, and is probably better handled by dedicated tools / by modifying the binaries after they're compiled / by inserting extra linker commands.
  2. The DEP_BLOCK_0_2_CC_ARGS environment variable exposed to downstream build scripts. This was not really that useful, usually you want to know exactly what flags you're passing to your compiler, and the standard -fblocks flag is enough.

I will publish a deprecation notice in block-sys after this PR.

This is considered a private implementation detail, and is probably not safe to rely on.
@madsmtm madsmtm added the A-block2 Affects the `block2` crate label Jan 7, 2024
@madsmtm madsmtm force-pushed the block-sys-refactor branch from d580081 to 008402c Compare January 7, 2024 07:25
@madsmtm madsmtm added bug Something isn't working enhancement New feature or request labels Jan 7, 2024
@madsmtm madsmtm marked this pull request as ready for review January 7, 2024 07:26
@madsmtm madsmtm force-pushed the block-sys-refactor branch 2 times, most recently from b733009 to 20635c8 Compare January 7, 2024 07:44
`block-sys` doesn't actually build a library, it only links to it, so there is no real need for a build script, nor for the `links` key.

Additionally, it should actually only expose the six public symbols, and in that case, it just seems wasteful to have multiple crates.

This _does_ remove:
1. The ability to override the linking. This was brittle already, and is probably better handled by dedicated tools / by modifying the binaries after they're compiled / by inserting extra linker commands.
2. The `DEP_BLOCK_0_2_CC_ARGS` environment variable exposed to downstream build scripts. This was not really that useful, usually you want to know exactly what flags you're passing to your compiler, and the standard `-fblocks` flag is enough.
@madsmtm madsmtm force-pushed the block-sys-refactor branch from 20635c8 to 056e578 Compare January 7, 2024 07:55
@madsmtm madsmtm merged commit 42bcda9 into master Jan 7, 2024
16 of 19 checks passed
@madsmtm madsmtm deleted the block-sys-refactor branch January 7, 2024 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-block2 Affects the `block2` crate bug Something isn't working enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant