From 81159f279f7ada5f79f30acdfc3c0ea8c5588fa7 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Fri, 14 Feb 2025 10:26:44 +0100 Subject: [PATCH 1/4] Update the lmdb mdb.master branch --- lmdb-master-sys/lmdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lmdb-master-sys/lmdb b/lmdb-master-sys/lmdb index 9c9d3455..82c5609d 160000 --- a/lmdb-master-sys/lmdb +++ b/lmdb-master-sys/lmdb @@ -1 +1 @@ -Subproject commit 9c9d34558cc438f99aebd1ab58f83fd7faeabc0a +Subproject commit 82c5609dddbeae1e16b4079bf228fd1647ec4f57 From f219a1cf170ae352f0b5c5194ad5d817cd25c914 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Fri, 14 Feb 2025 10:39:28 +0100 Subject: [PATCH 2/4] Update the lmdb mdb.master3 branch --- lmdb-master3-sys/lmdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lmdb-master3-sys/lmdb b/lmdb-master3-sys/lmdb index 1e7891c0..fc757af2 160000 --- a/lmdb-master3-sys/lmdb +++ b/lmdb-master3-sys/lmdb @@ -1 +1 @@ -Subproject commit 1e7891c016a4518eaf0aa29f959b0cc8a22d4111 +Subproject commit fc757af206f965d6b281e384441d3a7d93f9d017 From 00ea6d9574b6d11c80fb687f215a04e3655e13b2 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Fri, 14 Feb 2025 10:43:38 +0100 Subject: [PATCH 3/4] Make sure the build scripts rerun when the LMDB files changes --- lmdb-master-sys/build.rs | 2 ++ lmdb-master3-sys/build.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lmdb-master-sys/build.rs b/lmdb-master-sys/build.rs index 9bff3df5..af508f4a 100644 --- a/lmdb-master-sys/build.rs +++ b/lmdb-master-sys/build.rs @@ -112,6 +112,8 @@ fn main() { #[cfg(feature = "bindgen")] generate::generate(); + println!("cargo::rerun-if-changed=lmdb"); + let mut lmdb = PathBuf::from(&env::var("CARGO_MANIFEST_DIR").unwrap()); lmdb.push("lmdb"); lmdb.push("libraries"); diff --git a/lmdb-master3-sys/build.rs b/lmdb-master3-sys/build.rs index 9bff3df5..af508f4a 100644 --- a/lmdb-master3-sys/build.rs +++ b/lmdb-master3-sys/build.rs @@ -112,6 +112,8 @@ fn main() { #[cfg(feature = "bindgen")] generate::generate(); + println!("cargo::rerun-if-changed=lmdb"); + let mut lmdb = PathBuf::from(&env::var("CARGO_MANIFEST_DIR").unwrap()); lmdb.push("lmdb"); lmdb.push("libraries"); From e78cb0804aaac30a691ad0411de4ec08182d3ca5 Mon Sep 17 00:00:00 2001 From: Kerollmops Date: Wed, 19 Feb 2025 10:37:41 +0100 Subject: [PATCH 4/4] Switch the LMDB upstream to GitLab and pull --- .gitmodules | 4 ++-- lmdb-master-sys/lmdb | 2 +- lmdb-master3-sys/lmdb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index ad5c36af..46641634 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "lmdb-master-sys/lmdb"] path = lmdb-master-sys/lmdb - url = https://github.com/LMDB/lmdb + url = https://git.openldap.org/openldap/openldap branch = mdb.master [submodule "lmdb-master3-sys/lmdb"] path = lmdb-master3-sys/lmdb - url = https://github.com/LMDB/lmdb + url = https://git.openldap.org/openldap/openldap branch = mdb.master3 diff --git a/lmdb-master-sys/lmdb b/lmdb-master-sys/lmdb index 82c5609d..b21e1b9f 160000 --- a/lmdb-master-sys/lmdb +++ b/lmdb-master-sys/lmdb @@ -1 +1 @@ -Subproject commit 82c5609dddbeae1e16b4079bf228fd1647ec4f57 +Subproject commit b21e1b9fea935d2f3b94e6d315db1c47a5753199 diff --git a/lmdb-master3-sys/lmdb b/lmdb-master3-sys/lmdb index fc757af2..9ec98ca0 160000 --- a/lmdb-master3-sys/lmdb +++ b/lmdb-master3-sys/lmdb @@ -1 +1 @@ -Subproject commit fc757af206f965d6b281e384441d3a7d93f9d017 +Subproject commit 9ec98ca00e8689de4fcd5400f2d5722cf14c56e8