Use --with-version when configuring jemalloc #77
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
espindola
force-pushed
the
correct-version
branch
2 times, most recently
from
ddbe4b5
to
a743c3e
Compare
BusyJay
reviewed
Mar 29, 2024
jemalloc-sys/build.rs
Outdated
| @@ -155,6 +155,17 @@ fn main() { | |||
| .expect("failed to copy config file to OUT_DIR"); | |||
| } | |||
|
|
|||
| // Create a dummy .git file so that 'git describe' fails and | |||
| // configure uses the VERSION file we provide. | |||
| if let Err(e) = fs::File::create(build_dir.join(".git")) { | |||
There was a problem hiding this comment.
You can pass the version to build script by --with-version=xxx instead.
Let's skip and delete the VERSION file in configure directory and only use version from CARGO_PKG_VERSION. So it's easier to maintain.
There was a problem hiding this comment.
done. I also updated the metadata part of the version so that still get the same result.
Signed-off-by: Rafael Ávila de Espíndola <[email protected]>
espindola
force-pushed
the
correct-version
branch
from
a743c3e
to
21c04c8
Compare
espindola
changed the title
BusyJay
reviewed
Mar 29, 2024
jemalloc-sys/Cargo.toml
Outdated
| @@ -1,6 +1,6 @@ | |||
| [package] | |||
| name = "tikv-jemalloc-sys" | |||
| version = "0.5.4+5.3.0-patched" | |||
| version = "0.5.4+5.3.0-0-g54eaed1d8b56b1aa528be3bdd1877e59c56fa90c" | |||
jemalloc-sys/build.rs
Outdated
| let out_dir = PathBuf::from(env::var_os("OUT_DIR").expect("OUT_DIR was not set")); | ||
| let src_dir = env::current_dir().expect("failed to get current directory"); | ||
| let version = expect_env("CARGO_PKG_VERSION"); | ||
| let metadata = version |
There was a problem hiding this comment.
Suggested change
| let metadata = version | |
| let je_version = version |
espindola
force-pushed
the
correct-version
branch
from
21c04c8
to
b012c86
Compare
BusyJay
reviewed
Mar 29, 2024
jemalloc-sys/Cargo.toml
Outdated
| @@ -1,6 +1,6 @@ | |||
| [package] | |||
| name = "tikv-jemalloc-sys" | |||
| version = "0.5.4+5.3.0-patched" | |||
| version = "0.5.4+5.3.0-0-ge13ca993e8ccb9ba9847cc330696e02839f328f7" | |||
There was a problem hiding this comment.
Suggested change
| version = "0.5.4+5.3.0-0-ge13ca993e8ccb9ba9847cc330696e02839f328f7" | |
| version = "0.5.4+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" |
This also changes the metadata of the version so that jemalloc still reports the same version as before. Fixes tikv#76 Signed-off-by: Rafael Ávila de Espíndola <[email protected]>
espindola
force-pushed
the
correct-version
branch
from
b012c86
to
f5ac3c0
Compare
BusyJay
approved these changes
Apr 1, 2024
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also changes the metadata of the version so that jemalloc still
reports the same version as before.
Fixes #76