From 21c04c8c92a121ed6c4394198174db5b48f57447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <rafael@espindo.la>
Date: Thu, 28 Mar 2024 13:10:49 -0100
Subject: [PATCH] Use --with-version when configuring jemalloc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also changes the metadata of the version so that jemalloc still
reports the same version as before.

Fixes tikv/jemallocator#76

Signed-off-by: Rafael Ávila de Espíndola <rafael@espindo.la>
---
 jemalloc-sys/Cargo.toml        | 2 +-
 jemalloc-sys/build.rs          | 8 +++++++-
 jemalloc-sys/configure/VERSION | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)
 delete mode 100644 jemalloc-sys/configure/VERSION

diff --git a/jemalloc-sys/Cargo.toml b/jemalloc-sys/Cargo.toml
index 0e854dd8f..e7565497e 100644
--- a/jemalloc-sys/Cargo.toml
+++ b/jemalloc-sys/Cargo.toml
@@ -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"
 authors = [
     "Alex Crichton <alex@alexcrichton.com>",
     "Gonzalo Brito Gadeschi <gonzalobg88@gmail.com>",
diff --git a/jemalloc-sys/build.rs b/jemalloc-sys/build.rs
index cec3e0c8a..8196cad49 100644
--- a/jemalloc-sys/build.rs
+++ b/jemalloc-sys/build.rs
@@ -67,6 +67,11 @@ fn main() {
     let num_jobs = expect_env("NUM_JOBS");
     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
+        .split_once('+')
+        .expect("metadata part missing from version")
+        .1;
 
     info!("TARGET={}", target);
     info!("HOST={}", host);
@@ -151,7 +156,7 @@ fn main() {
     assert!(build_dir.exists());
 
     // Configuration files
-    let config_files = ["configure", "VERSION"];
+    let config_files = ["configure"];
 
     // Copy the configuration files to jemalloc's source directory
     for f in &config_files {
@@ -174,6 +179,7 @@ fn main() {
     .env("CFLAGS", cflags.clone())
     .env("LDFLAGS", cflags.clone())
     .env("CPPFLAGS", cflags)
+    .arg(format!("--with-version={metadata}"))
     .arg("--disable-cxx")
     .arg("--enable-doc=no")
     .arg("--enable-shared=no");
diff --git a/jemalloc-sys/configure/VERSION b/jemalloc-sys/configure/VERSION
deleted file mode 100644
index 1dcfea03f..000000000
--- a/jemalloc-sys/configure/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-5.3.0-0-g54eaed1d8b56b1aa528be3bdd1877e59c56fa90c