Update to 0.10.2

4 files changed, 241 insertions, 89 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 54f7eea71cfc..bfe6adf968f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = libmdbx
 	pkgdesc = Extremely fast, compact, powerful, embedded, transactional key-value database, with permissive license.
-	pkgver = 0.9.3
+	pkgver = 0.10.2
 	pkgrel = 1
 	url = https://github.com/erthink/libmdbx
 	arch = x86_64
 	license = OLDAP-2.8
 	makedepends = linux-headers
 	makedepends = bash
-	source = libmdbx-0.9.3.tar.gz::https://github.com/erthink/libmdbx/archive/v0.9.3.tar.gz
-	source = 0001-Make-MDBX_-vars-specifyable-via-args.patch
-	sha512sums = d69b24a304071edc13ceb41de44c7bd6cf1a18e8c462bb3147cf6809b4db92c41586cc65b1c242581c54c7e3ab2787c4773156657baea4aa9995fc6479c36306
-	sha512sums = a7504757ac9f555d6b4f214ba2a3e0565b48a9c0be95b891c9b2d95684f66a4d1483a7383679f0533604aa67f2063d21a78f3fc020616b234d40a2c2f5792dd9
+	makedepends = cmake
+	source = libmdbx-0.10.2.tar.gz::https://github.com/erthink/libmdbx/archive/refs/tags/v0.10.2.tar.gz
+	source = 0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch
+	sha512sums = 3d5f127a140841db6c89815adf65fdaefc4bb1d7941bfd1922c54ba38589dd49c6d6f5cd1dcf1b042c526c848cc6900eb80ee51fd8b2c0cabfe4a34c5678663e
+	sha512sums = 5e5fef4219279b10f0d4371fcbf3e2d4a7d958eb337f9de92aebb6a7d0d6644faa65eb804f46021678997a638ac601b03d9facbbf1164b45ae9075384d300df2
 
 pkgname = libmdbx
-
diff --git a/0001-Make-MDBX_-vars-specifyable-via-args.patch b/0001-Make-MDBX_-vars-specifyable-via-args.patch
deleted file mode 100644
index a44ffb8a0780..000000000000
--- a/0001-Make-MDBX_-vars-specifyable-via-args.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From cc48b816f73e62ab8711b401a40c769f444f97da Mon Sep 17 00:00:00 2001
-From: Noel Kuntze <noel.kuntze@thermi.consulting>
-Date: Fri, 29 Jan 2021 17:35:44 +0100
-Subject: [PATCH] Make MDBX_ vars specifyable via args
-
----
- GNUmakefile | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 34d4068..a61c9c8 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -157,11 +157,13 @@ reformat:
- 
- MAN_SRCDIR := src/man1/
- ALLOY_DEPS := $(wildcard src/*)
--MDBX_GIT_VERSION = $(shell set -o pipefail; git describe --tags | sed -n 's|^v*\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\)\(.*\)|\1|p' || echo 'Please fetch tags and/or use non-obsolete git version')
--MDBX_GIT_REVISION = $(shell set -o pipefail; git rev-list --count HEAD ^`git tag --sort=-version:refname | sed -n '/^\(v[0-9]\+\.[0-9]\+\.[0-9]\+\)*/p;q' || echo 'failed_git_tag_with_sort'` || echo 'Please use non-obsolete git version')
--MDBX_GIT_TIMESTAMP = $(shell git show --no-patch --format=%cI HEAD || echo 'Please install latest get version')
--MDBX_GIT_DESCRIBE = $(shell git describe --tags --long --dirty=-dirty || echo 'Please fetch tags and/or install non-obsolete git version')
--MDBX_VERSION_SUFFIX = $(shell set -o pipefail; echo -n '$(MDBX_GIT_DESCRIBE)' | tr -c -s '[a-zA-Z0-9]' _)
-+MDBX_GIT_VERSION ?= $(shell set -o pipefail; git describe --tags | sed -n 's|^v*\([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\)\(.*\)|\1|p' || echo 'Please fetch tags and/or use non-obsolete git version')
-+MDBX_GIT_REVISION ?= $(shell set -o pipefail; git rev-list --count HEAD ^`git tag --sort=-version:refname | sed -n '/^\(v[0-9]\+\.[0-9]\+\.[0-9]\+\)*/p;q' || echo 'failed_git_tag_with_sort'` || echo 'Please use non-obsolete git version')
-+MDBX_GIT_TIMESTAMP ?= $(shell git show --no-patch --format=%cI HEAD || echo 'Please install latest get version')
-+MDBX_GIT_DESCRIBE ?= $(shell git describe --tags --long --dirty=-dirty || echo 'Please fetch tags and/or install non-obsolete git version')
-+MDBX_GIT_TREE ?= $(shell git show --no-patch --format=%T HEAD || echo 'Please install latest get version')
-+MDBX_GIT_COMMIT ?= $(shell git show --no-patch --format=%H HEAD || echo 'Please install latest get version')
-+MDBX_VERSION_SUFFIX ?= $(shell set -o pipefail; echo -n '$(MDBX_GIT_DESCRIBE)' | tr -c -s '[a-zA-Z0-9]' _)
- MDBX_BUILD_SOURCERY = $(shell set -o pipefail; $(MAKE) CXXSTD= -s src/version.c && (openssl dgst -r -sha256 src/version.c || sha256sum src/version.c || shasum -a 256 src/version.c) 2>/dev/null | cut -d ' ' -f 1 || echo 'Please install openssl or sha256sum or shasum')_$(MDBX_VERSION_SUFFIX)
- MDBX_DIST_DIR = libmdbx-$(MDBX_VERSION_SUFFIX)
- 
-@@ -232,13 +234,11 @@ mdbx_%:	src/mdbx_%.c libmdbx.a
- mdbx_test: $(TEST_OBJ) libmdbx.$(SO_SUFFIX)
- 	$(CXX) $(CXXFLAGS) $(TEST_OBJ) -Wl,-rpath . -L . -l mdbx $(EXE_LDFLAGS) $(LIBS) -o $@
- 
--git_DIR := $(shell if [ -d .git ]; then echo .git; elif [ -s .git -a -f .git ]; then grep '^gitdir: ' .git | cut -d ':' -f 2; else echo "Please use libmdbx as a git-submodule or the amalgamated source code" >&2 && echo git_directory; fi)
--
--src/version.c: src/version.c.in $(lastword $(MAKEFILE_LIST)) $(git_DIR)/HEAD $(git_DIR)/index $(git_DIR)/refs/tags
-+src/version.c: src/version.c.in $(lastword $(MAKEFILE_LIST))
- 	sed \
- 		-e "s|@MDBX_GIT_TIMESTAMP@|$(MDBX_GIT_TIMESTAMP)|" \
--		-e "s|@MDBX_GIT_TREE@|$(shell git show --no-patch --format=%T HEAD || echo 'Please install latest get version')|" \
--		-e "s|@MDBX_GIT_COMMIT@|$(shell git show --no-patch --format=%H HEAD || echo 'Please install latest get version')|" \
-+		-e "s|@MDBX_GIT_TREE@|$(MDBX_GIT_TREE)|" \
-+		-e "s|@MDBX_GIT_COMMIT@|$(MDBX_GIT_COMMIT)|" \
- 		-e "s|@MDBX_GIT_DESCRIBE@|$(MDBX_GIT_DESCRIBE)|" \
- 		-e "s|\$${MDBX_VERSION_MAJOR}|$(shell echo '$(MDBX_GIT_VERSION)' | cut -d . -f 1)|" \
- 		-e "s|\$${MDBX_VERSION_MINOR}|$(shell echo '$(MDBX_GIT_VERSION)' | cut -d . -f 2)|" \
-@@ -263,8 +263,8 @@ mdbx-static.o: src/config.h src/version.c src/alloy.c $(ALLOY_DEPS) $(lastword $
- docs/Doxyfile: docs/Doxyfile.in src/version.c
- 	sed \
- 		-e "s|@MDBX_GIT_TIMESTAMP@|$(MDBX_GIT_TIMESTAMP)|" \
--		-e "s|@MDBX_GIT_TREE@|$(shell git show --no-patch --format=%T HEAD || echo 'Please install latest get version')|" \
--		-e "s|@MDBX_GIT_COMMIT@|$(shell git show --no-patch --format=%H HEAD || echo 'Please install latest get version')|" \
-+		-e "s|@MDBX_GIT_TREE@|$(MDBX_GIT_TREE)" \
-+		-e "s|@MDBX_GIT_COMMIT@|$(MDBX_GIT_COMMIT)|" \
- 		-e "s|@MDBX_GIT_DESCRIBE@|$(MDBX_GIT_DESCRIBE)|" \
- 		-e "s|\$${MDBX_VERSION_MAJOR}|$(shell echo '$(MDBX_GIT_VERSION)' | cut -d . -f 1)|" \
- 		-e "s|\$${MDBX_VERSION_MINOR}|$(shell echo '$(MDBX_GIT_VERSION)' | cut -d . -f 2)|" \
--- 
-2.30.0
-
diff --git a/0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch b/0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch
new file mode 100644
index 000000000000..8fb2bcddae57
--- /dev/null
+++ b/0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch
@@ -0,0 +1,207 @@
+From b4acc32ca535c93b3a80ebfaddf898250ca12916 Mon Sep 17 00:00:00 2001
+From: Noel Kuntze <noel.kuntze@thermi.consulting>
+Date: Thu, 8 Jul 2021 17:01:30 +0200
+Subject: [PATCH] mdbx: Remove all checks for amalgated or git source,
+ implement tests into CMakeLists.txt
+
+---
+ CMakeLists.txt | 152 ++++++++++++++++++++++++++++++++++++++-----------
+ GNUmakefile    |  12 +---
+ 2 files changed, 121 insertions(+), 43 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e74432b0..7b7f2898 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,38 +55,8 @@ else()
+   set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_AVAILABLE FALSE)
+ endif()
+ 
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/core.c" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/alloy.c" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/version.c.in" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/man1" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/mdbx_chk.c" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/mdbx.c++")
+-  set(MDBX_AMALGAMATED_SOURCE FALSE)
+-  find_program(GIT git)
+-  if(NOT GIT)
+-    message(SEND_ERROR "Git command-line tool not found")
+-  endif()
+-  set(MDBX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+-elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.c" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx.c++" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/man1" AND
+-    EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mdbx_chk.c")
+-  set(MDBX_AMALGAMATED_SOURCE TRUE)
+-  set(MDBX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+-else()
+-  message(FATAL_ERROR "\n"
+-    "Please don't use tarballs nor zips which are automatically provided by Github!  "
+-    "These archives do not contain version information and thus are unfit to build libmdbx.  "
+-    "You can vote for ability of disabling auto-creation such unsuitable archives at https://github.community/t/disable-tarball\n"
+-    "Instead of above, just clone the git repository, either download a tarball or zip with the properly amalgamated source core.  "
+-    "For embedding libmdbx use a git-submodule or the amalgamated source code.\n"
+-    "Please, avoid using any other techniques.")
+-endif()
++set(MDBX_AMALGAMATED_SOURCE FALSE)
++set(MDBX_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src")
+ 
+ if(DEFINED PROJECT_NAME)
+   set(SUBPROJECT ON)
+@@ -677,6 +647,124 @@ endif()
+ 
+ ################################################################################
+ 
++# example
++add_executable(mdbx_example mdbx.h example/example-mdbx.c)
++target_setup_options(mdbx_example)
++target_link_libraries(mdbx_example mdbx)
++if(MDBX_C_STANDARD)
++  set_target_properties(mdbx_example PROPERTIES
++    C_STANDARD ${MDBX_C_STANDARD} C_STANDARD_REQUIRED ON)
++endif()
++
++################################################################################
++
++# add targets for tests
++
++if(CMAKE_GENERATOR_PLATFORM MATCHES CYGWIN.* OR
++   CMAKE_GENERATOR_PLATFORM MATCHES MINGW.* OR
++   CMAKE_GENERATOR_PLATFORM MATCHES MSYS.* OR
++   CMAKE_GENERATOR_PLATFORM MATCHES Windows.*)
++  set(TEST_SRC
++    test/osal-windows.cc)
++else()
++  set(TEST_SRC
++    test/osal-unix.cc)
++endif()
++
++if(CMAKE_GENERATOR_PLATFORM MATCHES Darwin.* OR
++   CMAKE_GENERATOR_PLATFORM MATCHES Mach.*)
++  set(TEST_ITER
++    2)
++else()
++  set(TEST_ITER
++    12)
++endif()
++
++if(NOT TEST_DB)
++  set(TEST_DB
++    /tmp/mdbx-test.db
++  )
++endif()
++if(NOT TEST_LOG)
++  set(TEST_LOG
++    /tmp/mdbx-test.log
++  )
++endif()
++
++if(MDBX_ENABLE_TESTS)
++  add_custom_target(build-test ALL
++    DEPENDS mdbx_example mdbx_test mdbx_chk
++    )
++
++  add_custom_target(mdbx-test
++    COMMAND
++    rm -f "${TEST_DB}" "${TEST_LOG}.gz"    
++    COMMAND
++    ./mdbx_test --table=+data.integer --keygen.split=29 --datalen.min=min --datalen.max=max --progress --console=no "--repeat=${TEST_ITER}" "--pathname=${TEST_DB}" --dont-cleanup-after ${MDBX_TEST_EXTRA} basic | gzip >> "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_test --mode=-writemap,-nosync-safe,-lifo --progress --console=no --repeat=12 "--pathname=${TEST_DB}" --dont-cleanup-after ${MDBX_TEST_EXTRA} basic | gzip >> "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_chk -vvn "${TEST_DB}"
++    COMMAND
++    ./mdbx_chk -vvn "${TEST_DB}-copy"
++   DEPENDS mdbx build-test
++  )
++  add_custom_target(test-singleprocess
++    COMMAND
++    rm -f "${TEST_DB}" "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_test --table=+data.integer --keygen.split=29 --datalen.min=min --datalen.max=max --progress --console=no --repeat=42 "--pathname=${TEST_DB}" --dont-cleanup-after ${MDBX_TEST_EXTRA} --hill| gzip >> "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_test --progress --console=no --repeat=2 "--pathname=${TEST_DB}" --dont-cleanup-before --dont-cleanup-after --copy | gzip >> "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_test --mode=-writemap,-nosync-safe,-lifo --progress --console=no --repeat=42 "--pathname=${TEST_DB}" --dont-cleanup-after ${MDBX_TEST_EXTRA} --nested| gzip >> ${TEST_LOG}.gz
++    COMMAND
++    ./mdbx_chk -vvn "${TEST_DB}"
++    COMMAND
++    ./mdbx_chk -vvn "${TEST_DB}-copy"
++    DEPENDS build-test
++    )
++  add_custom_target(test-fault
++    COMMAND
++    rm -f "${TEST_DB}" "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_test --progress --console=no "--pathname=${TEST_DB}" --inject-writefault=42 --dump-config --dont-cleanup-after ${MDBX_TEST_EXTRA} basic | gzip >> "${TEST_LOG}.gz"
++    COMMAND
++    ./mdbx_chk -vvnw "${TEST_DB}"
++    COMMAND
++    [ -e "${TEST_DB}-copy" ] && ./mdbx_chk -vvn "${TEST_DB}-copy"
++    DEPENDS build-test
++    )
++
++  if(USE_VALGRIND)
++    set_target_properties(build-test
++      PROPERTIES
++      CFLAGS_EXTRA "-Ofast -DMDBX_USE_VALGRIND")
++    add_custom_target(memcheck
++      DEPENDS valgrind)
++    add_custom_target(valgrind
++      COMMAND
++      rm -f valgrind-*.log "${TEST_DB}" "${TEST_LOG}.gz"
++      COMMAND
++      ${VALGRIND_EXE} ./mdbx_test --table=+data.integer --keygen.split=29 --datalen.min=min --datalen.max=max --progress --console=no --repeat=2 "--pathname=${TEST_DB}" --dont-cleanup-after ${MDBX_TEST_EXTRA} basic | gzip >> "${TEST_LOG}.gz" &&
++      ${VALGRIND_EXE} ./mdbx_test --progress --console=no "--pathname=${TEST_DB}" --dont-cleanup-before --dont-cleanup-after --copy | gzip >> "${TEST_LOG}.gz" &&
++      ${VALGRIND_EXE} ./mdbx_test --mode=-writemap,-nosync-safe,-lifo --progress --console=no --repeat=4 "--pathname=${TEST_DB}" --dont-cleanup-after ${MDBX_TEST_EXTRA} basic | gzip >> "${TEST_LOG}.gz" &&
++      ${VALGRIND_EXE} ./mdbx_chk -vvn "${TEST_DB}" &&
++      ${VALGRIND_EXE} ./mdbx_chk -vvn "${TEST_DB}-copy"
++      DEPENDS build-test
++    )
++  endif()
++
++  if(USE_GCC_ANALYZER)
++    set_target_properties(build-test
++      PROPERTIES
++      CFLAGS_EXTRA "-Og -fanalyzer -Wno-error")
++  endif()
++
++endif()
++
++################################################################################
++
+ # mdbx-shared-lib installation
+ if(NOT DEFINED MDBX_DLL_INSTALL_DESTINATION)
+   if(WIN32)
+diff --git a/GNUmakefile b/GNUmakefile
+index 509a0923..cbe43b23 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -397,17 +397,7 @@ mdbx_test: $(TEST_OBJ) libmdbx.$(SO_SUFFIX)
+ 	$(QUIET)$(CXX) $(CXXFLAGS) $(TEST_OBJ) -Wl,-rpath . -L . -l mdbx $(EXE_LDFLAGS) $(LIBS) -o $@
+ 
+ $(git_DIR)/HEAD $(git_DIR)/index $(git_DIR)/refs/tags:
+-	@echo '*** ' >&2
+-	@echo '*** Please don''t use tarballs nor zips which are automatically provided by Github !' >&2
+-	@echo '*** These archives do not contain version information and thus are unfit to build libmdbx.' >&2
+-	@echo '*** You can vote for ability of disabling auto-creation such unsuitable archives at https://github.community/t/disable-tarball' >&2
+-	@echo '*** ' >&2
+-	@echo '*** Instead of above, just clone the git repository, either download a tarball or zip with the properly amalgamated source core.' >&2
+-	@echo '*** For embedding libmdbx use a git-submodule or the amalgamated source code.' >&2
+-	@echo '*** ' >&2
+-	@echo '*** Please, avoid using any other techniques.' >&2
+-	@echo '*** ' >&2
+-	@false
++	@true
+ 
+ src/version.c: src/version.c.in $(lastword $(MAKEFILE_LIST)) $(git_DIR)/HEAD $(git_DIR)/index $(git_DIR)/refs/tags
+ 	@echo '  MAKE $@'
+-- 
+2.32.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 7e0b9e93a97c..f0eb2ba23c1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,55 @@
 # Contributor: Noel Kuntze <noel.kuntze@thermi.consulting>
 # Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
 pkgname=libmdbx
-pkgver=0.9.3
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="Extremely fast, compact, powerful, embedded, transactional key-value database, with permissive license."
 url="https://github.com/erthink/libmdbx"
 arch=(x86_64)
 license=(OLDAP-2.8)
-makedepends=(linux-headers bash)
+makedepends=(linux-headers bash cmake)
 subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
-source=($pkgname-$pkgver.tar.gz::https://github.com/erthink/libmdbx/archive/v$pkgver.tar.gz
-	0001-Make-MDBX_-vars-specifyable-via-args.patch
-	)
+#noextract=("$pkgname-$pkgver.tar.gz")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/erthink/libmdbx/archive/refs/tags/v$pkgver.tar.gz"
+		"0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch")
 
-_make_args="SHELL=bash MDBX_GIT_TREE=160b2d1d503c72a1fc92e62ad4e7d349e0d84ccd \
-	MDBX_GIT_COMMIT=d78150de79c5bce274bb2020702224fe9479b1d2 MDBX_GIT_DESCRIBE=v0.9.3-0-gd78150d MDBX_GIT_REVISION=0 \
-	MDBX_GIT_VERSION=$pkgver MDBX_GIT_TIMESTAMP=2021-02-02T22:34:42+03:00"
+# _make_args="SHELL=bash MDBX_GIT_TREE=160b2d1d503c72a1fc92e62ad4e7d349e0d84ccd \
+# 	MDBX_GIT_COMMIT=50328de63cec1c3ec689515669f6ce2f7a42abb6 MDBX_GIT_DESCRIBE=v0.10.1-0-g50328de MDBX_GIT_REVISION=0 \
+# 	MDBX_GIT_VERSION=$pkgver MDBX_GIT_TIMESTAMP=2021-06-01T03:21:59+03:00
+# 	MDBX_BUILD_SOURCERY=60c038549283f9c726575aea9038e3be3c43b15fbc8c58460103259659373dc6_v0_10_1_5_g18bc28b"
 
-prepare()
-{
+prepare() {
+	#rm -rf "$srcdir/$pkgname-$pkgver"
+	#mkdir -p "$srcdir/$pkgname-$pkgver"
+	#tar -C "$srcdir/$pkgname-$pkgver" -xf "$srcdir/$pkgname-$pkgver.tar.gz" 
 	cd "$srcdir/$pkgname-$pkgver/"
-	for i in "$srcdir/"*.patch
-	do
-		patch -p1 -i $i
-	done
+	patch < "$srcdir/0001-mdbx-Remove-all-checks-for-amalgated-or-git-source-i.patch"
 }
+
 build() {
-	export CFLAGS="$CFLAGS -fPIC"
 	cd "$srcdir/$pkgname-$pkgver/"
-	make all prefix=/ $_make_args
+	echo "$pkgver.0" > VERSION
+	export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
+	cmake . -DMDBX_ENABLE_TESTS=True
+	make -f Makefile all prefix=/
 }
 
 check() {
 	cd "$srcdir/$pkgname-$pkgver/"
-	make test TEST_DB=/tmp/mdbx-test.db TEST_LOG=/tmp/mdbx-test.log.gz $_make_args
+	export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
+	cmake . -DMDBX_ENABLE_TESTS=True
+	make -f Makefile mdbx-test test-singleprocess build-test TEST_DB=/tmp/mdbx-test.db TEST_LOG=/tmp/mdbx-test.log.gz
 	rm /tmp/mdbx-test.*
 }
 
 package() {
 	# Replace with proper package command(s)
 	cd "$srcdir/$pkgname-$pkgver/"
-	make install "DESTDIR=$pkgdir" prefix=/usr mandir=/usr/share/man $_make_args
+	export CFLAGS="$CFLAGS -fPIC -Wno-int-to-pointer-cast"
+	cmake . -DMDBX_ENABLE_TESTS=True -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_DO_STRIP=False -DMDBX_MAN_INSTALL_DESTINATION=/usr/share/man/man1 \
+		-DMDBX_TOOLS_INSTALL_DESTINATION=/usr/bin -DMDBX_DLL_INSTALL_DESTINATION=/usr/lib
+	make -f Makefile install DESTDIR="$pkgdir"
 }
 
-sha512sums=('d69b24a304071edc13ceb41de44c7bd6cf1a18e8c462bb3147cf6809b4db92c41586cc65b1c242581c54c7e3ab2787c4773156657baea4aa9995fc6479c36306'
-            'a7504757ac9f555d6b4f214ba2a3e0565b48a9c0be95b891c9b2d95684f66a4d1483a7383679f0533604aa67f2063d21a78f3fc020616b234d40a2c2f5792dd9')
+sha512sums=('3d5f127a140841db6c89815adf65fdaefc4bb1d7941bfd1922c54ba38589dd49c6d6f5cd1dcf1b042c526c848cc6900eb80ee51fd8b2c0cabfe4a34c5678663e'
+            '5e5fef4219279b10f0d4371fcbf3e2d4a7d958eb337f9de92aebb6a7d0d6644faa65eb804f46021678997a638ac601b03d9facbbf1164b45ae9075384d300df2')