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.

Sign up for GitHub

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

Jump to bottom

Update bzip2-sys in order to use "static" feature #628

Merged
merged 1 commit into from
Jun 15, 2021
Merged

Update bzip2-sys in order to use "static" feature #628

merged 1 commit into from
Jun 15, 2021

Conversation

arthurprs
Copy link

Due to trifectatechfoundation/bzip2-rs#58 bzip2-sys versions above 0.1.8 do not guarantee that bzip2 is statically linked.
Which in turn causes the build to fail depending if pkg-config says bzip2 is available.

@arthurprs arthurprs force-pushed the fix-bzip2-sys branch 2 times, most recently from 9c5ab30 to 014aa72 Compare June 4, 2021 10:09
@Connor1996
Copy link
Member

From the PR's description, seems the libz does the same way?

@Connor1996 Connor1996 requested a review from BusyJay June 4, 2021 10:32
@arthurprs
Copy link
Author

arthurprs commented Jun 4, 2021 •
edited
Loading

Yes, but libz-sys has a "static" feature that rust-rocksdb sets libz-sys = { version = "1.1", features = ["static"] }
A similar feature is missing from bzip2-sys and is tracked here trifectatechfoundation/bzip2-rs#56

Connor1996
Connor1996 approved these changes Jun 7, 2021
View reviewed changes
Copy link
Member

@Connor1996 Connor1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@Connor1996
Copy link
Member

Please fix the sign-off

@arthurprs
Copy link
Author

It should be good to go now.

@BusyJay
Copy link
Member

BusyJay commented Jun 7, 2021 •
edited
Loading

How about fork it to TiKV org and introduce the feature directly? So that only thing we need to do is using a patch in TiKV's Cargo.toml.

@arthurprs
Copy link
Author

It's possible, yes. Here I just wanted to fix the build and not create forks and other moving parts 😅 .

@BusyJay
Copy link
Member

BusyJay commented Jun 8, 2021

trifectatechfoundation/bzip2-rs#78 is merged, you can use the patch directly in TiKV now.

@arthurprs
Copy link
Author

arthurprs commented Jun 8, 2021 •
edited
Loading

I can update the PR when the change is included in the next release https://crates.io/crates/bzip2-sys.

@arthurprs arthurprs changed the title Stick bzip2-sys version to fix build Update bzip2-sys in order to use "static" feature Jun 10, 2021
@arthurprs
Update bzip2-sys in order to use "static" feature
71d505f 
This is necessary in order to guarantee that it'll be statically linked.

Signed-off-by: Arthur Silva <[email protected]>
@arthurprs
Copy link
Author

PR updated to the latest crates.io version with the static feature. Should be good to merge now.

@Connor1996
Copy link
Member

/merge

@ti-srebot ti-srebot added the status/can-merge Status: Can merge to base branch label Jun 15, 2021
@ti-srebot
Copy link

/run-all-tests

@ti-srebot ti-srebot merged commit 23a4d47 into tikv:master Jun 15, 2021
@ti-srebot ti-srebot mentioned this pull request Jun 15, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ti-srebot ti-srebot ti-srebot approved these changes

@Connor1996 Connor1996 Connor1996 approved these changes

@BusyJay BusyJay BusyJay approved these changes

Assignees
No one assigned
Labels
status/can-merge Status: Can merge to base branch status/LGT2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@arthurprs @Connor1996 @BusyJay @ti-srebot