From 5d933d09d3892a6c6ab70f18c36a3c812b1350c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Sat, 25 Jun 2022 15:27:33 +0300 Subject: [PATCH 1/3] mdbx: minor refine/clarify descriptions of `MDBX_LOCKNAME` and `MDBX_DATANAME`. --- mdbx.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mdbx.h b/mdbx.h index c6211aba..0e8ee9fe 100644 --- a/mdbx.h +++ b/mdbx.h @@ -824,9 +824,11 @@ enum MDBX_constants { /* THE FILES ******************************************************************* * At the file system level, the environment corresponds to a pair of files. */ -/** \brief The name of the lock file in the environment */ +/** \brief The name of the lock file in the environment + * without using \ref MDBX_NOSUBDIR */ #define MDBX_LOCKNAME "/mdbx.lck" -/** \brief The name of the data file in the environment */ +/** \brief The name of the data file in the environment + * without using \ref MDBX_NOSUBDIR */ #define MDBX_DATANAME "/mdbx.dat" /** \brief The suffix of the lock file when \ref MDBX_NOSUBDIR is used */ From 55d3783699e3b2672ba50ff56b1d6cb8a2849f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Sat, 25 Jun 2022 16:24:40 +0300 Subject: [PATCH 2/3] mdbx: update patch for old buildroot versions. --- ...libmdbx-new-package-library-database.patch | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/buildroot/0001-package-libmdbx-new-package-library-database.patch b/packages/buildroot/0001-package-libmdbx-new-package-library-database.patch index 8b34d40c..cf5d5a7c 100644 --- a/packages/buildroot/0001-package-libmdbx-new-package-library-database.patch +++ b/packages/buildroot/0001-package-libmdbx-new-package-library-database.patch @@ -1,25 +1,26 @@ -From 4c309b57bca0526b0c110990c315682f027ccfad Mon Sep 17 00:00:00 2001 +From dd398c9a92b87f7c65798545d776735d27f2a4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= -Date: Thu, 28 Apr 2022 11:02:59 +0300 +Date: Sat, 25 Jun 2022 16:22:22 +0300 Subject: [PATCH] package/libmdbx: new package (library/database). -This patch adds libmdbx v0.11.7: +This patch adds libmdbx v0.11.8: - libmdbx is one of the fastest compact embeddable key-value ACID database. - libmdbx has a specific set of properties and capabilities, focused on creating unique lightweight solutions. - libmdbx surpasses the legendary LMDB (Lightning Memory-Mapped Database) in terms of reliability, features and performance. - - https://libmdbx.dqdkfa.ru/ + - https://github.com/erthink/libmdbx Signed-off-by: Leonid Yuriev +Signed-off-by: Yann E. MORIN --- DEVELOPERS | 3 +++ package/Config.in | 1 + package/libmdbx/Config.in | 45 ++++++++++++++++++++++++++++++++++++ - package/libmdbx/libmdbx.hash | 5 ++++ + package/libmdbx/libmdbx.hash | 6 +++++ package/libmdbx/libmdbx.mk | 42 +++++++++++++++++++++++++++++++++ - 5 files changed, 96 insertions(+) + 5 files changed, 97 insertions(+) create mode 100644 package/libmdbx/Config.in create mode 100644 package/libmdbx/libmdbx.hash create mode 100644 package/libmdbx/libmdbx.mk @@ -52,7 +53,7 @@ index 016a99ed1a..a6f95bfaa9 100644 source "package/libodb-mysql/Config.in" diff --git a/package/libmdbx/Config.in b/package/libmdbx/Config.in new file mode 100644 -index 0000000000..ef44a955fe +index 0000000000..a9a4ac45c5 --- /dev/null +++ b/package/libmdbx/Config.in @@ -0,0 +1,45 @@ @@ -71,7 +72,7 @@ index 0000000000..ef44a955fe + libmdbx surpasses the legendary LMDB in terms of + reliability, features and performance. + -+ https://libmdbx.dqdkfa.ru/ ++ https://libmdbx.dqdkfa.ru + +if BR2_PACKAGE_LIBMDBX + @@ -103,18 +104,19 @@ index 0000000000..ef44a955fe + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 diff --git a/package/libmdbx/libmdbx.hash b/package/libmdbx/libmdbx.hash new file mode 100644 -index 0000000000..61f800d433 +index 0000000000..3f2be134c3 --- /dev/null +++ b/package/libmdbx/libmdbx.hash -@@ -0,0 +1,5 @@ -+# Hashes from https://libmdbx.dqdkfa.ru//release/SHA256SUMS +@@ -0,0 +1,6 @@ ++# Hashes from: https://libmdbx.dqdkfa.ru/release/SHA256SUMS ++sha256 06011f361481ee7adc2111e48b7b121384294e0b6b8f10c75e7886629297b279 libmdbx-amalgamated-0.11.8.tar.xz +sha256 3a9fb6a4cd941e646597235518714373fda1ca6d4c5e23669afe70ea87c20940 libmdbx-amalgamated-0.11.7.tar.xz + +# Locally calculated +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk new file mode 100644 -index 0000000000..ab279614ab +index 0000000000..130fe96793 --- /dev/null +++ b/package/libmdbx/libmdbx.mk @@ -0,0 +1,42 @@ @@ -124,7 +126,7 @@ index 0000000000..ab279614ab +# +################################################################################ + -+LIBMDBX_VERSION = 0.11.7 ++LIBMDBX_VERSION = 0.11.8 +LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.xz +LIBMDBX_SITE = https://libmdbx.dqdkfa.ru/release +LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO @@ -161,5 +163,5 @@ index 0000000000..ab279614ab + +$(eval $(cmake-package)) -- -2.32.0 +2.36.1 From 7b735c272d384b2d9adc27c8ce0f16cd76ce6409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Sat, 25 Jun 2022 22:14:06 +0300 Subject: [PATCH 3/3] mdbx: allow predefine/customise `MDBX_LOCK_SUFFIX`, `MDBX_DATANAME`, `MDBX_LOCKNAME`. --- mdbx.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mdbx.h b/mdbx.h index 0e8ee9fe..f09b867d 100644 --- a/mdbx.h +++ b/mdbx.h @@ -824,15 +824,21 @@ enum MDBX_constants { /* THE FILES ******************************************************************* * At the file system level, the environment corresponds to a pair of files. */ +#ifndef MDBX_LOCKNAME /** \brief The name of the lock file in the environment * without using \ref MDBX_NOSUBDIR */ #define MDBX_LOCKNAME "/mdbx.lck" +#endif +#ifndef MDBX_DATANAME /** \brief The name of the data file in the environment * without using \ref MDBX_NOSUBDIR */ #define MDBX_DATANAME "/mdbx.dat" +#endif +#ifndef MDBX_LOCK_SUFFIX /** \brief The suffix of the lock file when \ref MDBX_NOSUBDIR is used */ #define MDBX_LOCK_SUFFIX "-lck" +#endif /* DEBUG & LOGGING ************************************************************/