From patchwork Tue Oct 6 19:27:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?0JvQtdC+0L3QuNC0INCu0YDRjNC10LIgKExlb25pZCBZdXJpZXYp?= X-Patchwork-Id: 1377632 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=yuriev.ru Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=yuriev-ru.20150623.gappssmtp.com header.i=@yuriev-ru.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=nxtKi/TY; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C5SD6017yz9sTR for ; Wed, 7 Oct 2020 06:27:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A7578671B; Tue, 6 Oct 2020 19:27:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NNAgixtOiyVL; Tue, 6 Oct 2020 19:27:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5B1E586685; Tue, 6 Oct 2020 19:27:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7A3AE1BF5F8 for ; Tue, 6 Oct 2020 19:27:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 762E0857D8 for ; Tue, 6 Oct 2020 19:27:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gLDUsNocu8fs for ; Tue, 6 Oct 2020 19:27:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6A0F78502C for ; Tue, 6 Oct 2020 19:27:37 +0000 (UTC) Received: by mail-lf1-f68.google.com with SMTP id z19so16358644lfr.4 for ; Tue, 06 Oct 2020 12:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yuriev-ru.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GAfSILpsPsYqWo285i80zHrksK/QNMDX2Xvq/3P7QY8=; b=nxtKi/TYkmgoIBeUAujywdX9aVt64CcTrPc4vGABF1UiszOOOJRQCsDGZUXDXH4o5N AB8uw9JkSsf7x9hv9EZBYiQZOeon9FYcNb5VktoJIg/ZZmEa3bT1/ihk8Z+UA+fiNnTH aNhPUR27WF+2P/H4c1Srm2iKhT2bl4/+M+ecVeubDdR0YyeL2dzpfMaShto3Qm/Ie3D/ W7dJvEHdx4OEe+YQOihwf4zV+I8yU1clp7Rvudfas4zI0DYYuhV/R9miN8+jCF714NYA kB1Fm2kYLdFzSGQU1BJZv5JPealPFPOH5dLUxk3vSmiPdrCui10zu330Zo1kNTb5nHW7 k09w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GAfSILpsPsYqWo285i80zHrksK/QNMDX2Xvq/3P7QY8=; b=C4XticCuis9/3BZotRUGKQF8HiBqZeW5hWuljbIY2vnp7rOABNF3jvH9FNIAMcO4z7 LZIAqIQJ5jsvpgecaO7qIOEOwEq/cbraLWGy04HuWc4fqxHY+liG7q/FAPl9w0UB5fS1 gZ84R0TU2zMv+J3g9XQciAXSQP9VvI159Suu5rip5XKCH9Aq10n1Mrv89HVEFk0QHzfT tKrytbua0Z9uWtF/acElJvGw3Pbz3vRLxi0rI6wU+O0is0M7s83hb/kitS2NEwqJo7H/ 6XyVLLoF3UvIU3bnCAuRBN6CzGlsBv9ZG2cWgXvVFqk7Pod0FvnqNuRIqXcKXRf7kOP0 Wc2g== X-Gm-Message-State: AOAM532mSv9P9/GnVleFC6UQUw95Fgx1oAXeXy4vEQfiqKfvy/ej9wDf LMeGSylKLUDhiLzyw74FWbDKinNGXpk2Qg== X-Google-Smtp-Source: ABdhPJzic4DcoWhUCnJEP+TB6bjhL3e5Xu/Ct2/K2C1+vtwvnKig4r4Zm366hJ+h4VhBKPL3rOtmoA== X-Received: by 2002:ac2:5230:: with SMTP id i16mr942254lfl.33.1602012454491; Tue, 06 Oct 2020 12:27:34 -0700 (PDT) Received: from ly-ThinkPad-X1-Carbon-2nd.router.bigbrother-matrix.ru ([31.130.36.33]) by smtp.gmail.com with ESMTPSA id r7sm707736lfn.84.2020.10.06.12.27.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Oct 2020 12:27:33 -0700 (PDT) From: Leonid Yuriev To: buildroot@buildroot.org Date: Tue, 6 Oct 2020 22:27:09 +0300 Message-Id: <20201006192709.8265-2-leo@yuriev.ru> X-Mailer: git-send-email 2.28.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH v4 1/1] package/libmdbx: new package (library/database). X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Leonid Yuriev Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch adds libmdbx v0.9.1: - 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://github.com/erthink/libmdbx Reviewed-by: Heiko Thiery --- Changes v1 -> v2: - libmdbx version v0.8.2 -> v0.9.1 (released 2020-09-30) Changes v2 -> v3: - removed outcommented stuff (suggested by Heiko Thiery). - cleaned up and simplified the makefile (suggested by Heiko Thiery). - added patch for C++ header installation. - added patch with fix minor copy&paste typo. - added patch with pthread workaround for buggy toolchain/cmake/buildroot. - added patch for `pthread_yield()`. - passed `utils/check-package package/libmdbx/*` (suggested by Heiko Thiery) - passed `utils/test-pkg -a -p libmdbx`, except w/o threads & w/o MMU (suggested by Heiko Thiery). Changes v3 -> v4: - fix passing BR2_PACKAGE_LIBMDBX_TOOLS option to cmake. - fix using `depend on` instead of `select`, and add `comment` for C++ toolchain (suggested by Heiko Thiery). - fix minor help typo. Signed-off-by: Leonid Yuriev --- DEVELOPERS | 3 + package/Config.in | 1 + .../0001-mdbx-fix-minor-copy-paste-typo.patch | 27 ++++++++ ...e-fix-missing-installation-of-mdbx.h.patch | 54 +++++++++++++++ .../0003-mdbx-fix-obsolete-__noreturn.patch | 27 ++++++++ ...ield-instruction-on-ARM-if-unsupport.patch | 28 ++++++++ ...fix-minor-false-positive-GCC-warning.patch | 27 ++++++++ ...ad-workaround-for-buggy-toolchain-cm.patch | 65 +++++++++++++++++++ ...mdbx-fix-pthread_yield-for-non-GLIBC.patch | 42 ++++++++++++ package/libmdbx/Config.in | 42 ++++++++++++ package/libmdbx/libmdbx.hash | 2 + package/libmdbx/libmdbx.mk | 24 +++++++ 12 files changed, 342 insertions(+) create mode 100644 package/libmdbx/0001-mdbx-fix-minor-copy-paste-typo.patch create mode 100644 package/libmdbx/0002-mdbx-cmake-fix-missing-installation-of-mdbx.h.patch create mode 100644 package/libmdbx/0003-mdbx-fix-obsolete-__noreturn.patch create mode 100644 package/libmdbx/0004-mdbx-don-t-use-yield-instruction-on-ARM-if-unsupport.patch create mode 100644 package/libmdbx/0005-mdbx-load-fix-minor-false-positive-GCC-warning.patch create mode 100644 package/libmdbx/0006-mdbx-cmake-pthread-workaround-for-buggy-toolchain-cm.patch create mode 100644 package/libmdbx/0007-mdbx-fix-pthread_yield-for-non-GLIBC.patch create mode 100644 package/libmdbx/Config.in create mode 100644 package/libmdbx/libmdbx.hash create mode 100644 package/libmdbx/libmdbx.mk diff --git a/DEVELOPERS b/DEVELOPERS index f8655fa054..924e70e30c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1551,6 +1551,9 @@ N: Leon Anavi F: board/olimex/a10_olinuxino F: configs/olimex_a10_olinuxino_lime_defconfig +N: Leonid Yuriev +F: package/libmdbx + N: Lionel Flandrin F: package/python-babel/ F: package/python-daemonize/ diff --git a/package/Config.in b/package/Config.in index 51583d07d6..f87e0388a0 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1370,6 +1370,7 @@ menu "Database" source "package/kompexsqlite/Config.in" source "package/leveldb/Config.in" source "package/libgit2/Config.in" + source "package/libmdbx/Config.in" source "package/libodb/Config.in" source "package/libodb-boost/Config.in" source "package/libodb-mysql/Config.in" diff --git a/package/libmdbx/0001-mdbx-fix-minor-copy-paste-typo.patch b/package/libmdbx/0001-mdbx-fix-minor-copy-paste-typo.patch new file mode 100644 index 0000000000..d9ff3c5e71 --- /dev/null +++ b/package/libmdbx/0001-mdbx-fix-minor-copy-paste-typo.patch @@ -0,0 +1,27 @@ +From 5807e2eda046bff35946972289236bbef5c0c597 Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Thu, 1 Oct 2020 02:27:29 +0300 +Subject: [PATCH] mdbx++: fix minor copy&paste typo. + +Change-Id: I0af3e7ffbbd1231069a60f9f48880df3df2141d7 +Signed-off-by: Leonid Yuriev +--- + mdbx.h++ | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mdbx.h++ b/mdbx.h++ +index 095ff9abb..2050f4b92 100644 +--- a/mdbx.h++ ++++ b/mdbx.h++ +@@ -538,7 +538,7 @@ struct LIBMDBX_API_TYPE slice : public ::MDBX_val { + byte *from_base58(byte *dest, size_t dest_size, + bool ignore_spaces = false) const; + +- /// vReturns the buffer size in bytes needed for conversion ++ /// \brief Returns the buffer size in bytes needed for conversion + /// [Base58](https://en.wikipedia.org/wiki/Base58) dump to data. + MDBX_CXX11_CONSTEXPR size_t from_base58_bytes() const noexcept { + return length() / 11 * 8 + length() % 11 * 32 / 43; +-- +2.28.0 + diff --git a/package/libmdbx/0002-mdbx-cmake-fix-missing-installation-of-mdbx.h.patch b/package/libmdbx/0002-mdbx-cmake-fix-missing-installation-of-mdbx.h.patch new file mode 100644 index 0000000000..df49342ccb --- /dev/null +++ b/package/libmdbx/0002-mdbx-cmake-fix-missing-installation-of-mdbx.h.patch @@ -0,0 +1,54 @@ +From dc2cd19d566e84451ee47cf04277f97bc22771c5 Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Fri, 2 Oct 2020 00:05:02 +0300 +Subject: [PATCH] mdbx-cmake: fix missing installation of `mdbx.h++` + +Change-Id: I41975e4eeff6583a266b273b9a4f8486982ede90 +Signed-off-by: Leonid Yuriev +--- + CMakeLists.txt | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28db425c5..95f116521 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -485,7 +485,8 @@ fetch_version(MDBX "${CMAKE_CURRENT_SOURCE_DIR}" FALSE) + message(STATUS "libmdbx version is ${MDBX_VERSION}") + + # sources list +-set(LIBMDBX_SOURCES mdbx.h "${CMAKE_CURRENT_BINARY_DIR}/config.h" ) ++set(LIBMDBX_PUBLIC_HEADERS mdbx.h) ++set(LIBMDBX_SOURCES mdbx.h "${CMAKE_CURRENT_BINARY_DIR}/config.h") + if(MDBX_AMALGAMATED_SOURCE) + list(APPEND LIBMDBX_SOURCES mdbx.c) + else() +@@ -511,6 +512,7 @@ else() + endif(MDBX_AMALGAMATED_SOURCE) + if(MDBX_BUILD_CXX) + message(STATUS "Use C${MDBX_C_STANDARD} and C++${MDBX_CXX_STANDARD} for libmdbx") ++ list(APPEND LIBMDBX_PUBLIC_HEADERS mdbx.h++) + list(APPEND LIBMDBX_SOURCES "${MDBX_SOURCE_DIR}/mdbx.c++" mdbx.h++) + else() + message(STATUS "Use C${MDBX_C_STANDARD} for libmdbx but C++ portion is disabled") +@@ -561,7 +563,7 @@ if(MDBX_INSTALL_STATIC) + else() + add_library(mdbx-static STATIC EXCLUDE_FROM_ALL ${LIBMDBX_SOURCES}) + endif() +-set_target_properties(mdbx-static PROPERTIES PUBLIC_HEADER mdbx.h) ++set_target_properties(mdbx-static PROPERTIES PUBLIC_HEADER "${LIBMDBX_PUBLIC_HEADERS}") + target_compile_definitions(mdbx-static PRIVATE MDBX_BUILD_SHARED_LIBRARY=0) + target_setup_options(mdbx-static) + libmdbx_setup_libs(mdbx-static INTERFACE) +@@ -576,7 +578,7 @@ endif() + # build shared library + if(MDBX_BUILD_SHARED_LIBRARY) + add_library(mdbx SHARED ${LIBMDBX_SOURCES}) +- set_target_properties(mdbx PROPERTIES PUBLIC_HEADER mdbx.h) ++ set_target_properties(mdbx PROPERTIES PUBLIC_HEADER "${LIBMDBX_PUBLIC_HEADERS}") + target_compile_definitions(mdbx PRIVATE LIBMDBX_EXPORTS MDBX_BUILD_SHARED_LIBRARY=1 INTERFACE LIBMDBX_IMPORTS) + target_setup_options(mdbx) + libmdbx_setup_libs(mdbx PRIVATE) +-- +2.28.0 + diff --git a/package/libmdbx/0003-mdbx-fix-obsolete-__noreturn.patch b/package/libmdbx/0003-mdbx-fix-obsolete-__noreturn.patch new file mode 100644 index 0000000000..cb04334220 --- /dev/null +++ b/package/libmdbx/0003-mdbx-fix-obsolete-__noreturn.patch @@ -0,0 +1,27 @@ +From 280ed17ea2dff464c9688fcc92079f36d8b74621 Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Sat, 3 Oct 2020 11:35:26 +0300 +Subject: [PATCH] mdbx: fix obsolete `__noreturn`. + +Change-Id: Ic78843d6f16de2a409c16ceecc7acb2ed8aa3e68 +Signed-off-by: Leonid Yuriev +--- + mdbx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mdbx.c b/mdbx.c +index 04ea5140d..9212640fe 100644 +--- a/mdbx.c ++++ b/mdbx.c +@@ -141,7 +141,7 @@ __extern_C void __assert(const char *, const char *, unsigned int, const char *) + #else + __nothrow + #endif /* __THROW */ +- __noreturn; ++ MDBX_NORETURN; + #define __assert_fail(assertion, file, line, function) \ + __assert(assertion, file, line, function) + +-- +2.28.0 + diff --git a/package/libmdbx/0004-mdbx-don-t-use-yield-instruction-on-ARM-if-unsupport.patch b/package/libmdbx/0004-mdbx-don-t-use-yield-instruction-on-ARM-if-unsupport.patch new file mode 100644 index 0000000000..23f91d859b --- /dev/null +++ b/package/libmdbx/0004-mdbx-don-t-use-yield-instruction-on-ARM-if-unsupport.patch @@ -0,0 +1,28 @@ +From 70b615e8d4d10cda2d961a815dd15eb87a1f3925 Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Sun, 4 Oct 2020 14:54:11 +0300 +Subject: [PATCH] mdbx: don't use `yield` instruction on ARM if unsupported. + +Change-Id: I0b01d783fe4336b089f4b051fb61c203b5879aa5 +Signed-off-by: Leonid Yuriev +--- + mdbx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/mdbx.c b/mdbx.c +index aba445424..a9ba1ee85 100644 +--- a/mdbx.c ++++ b/mdbx.c +@@ -763,7 +763,8 @@ static __always_inline void atomic_yield(void) { + #else + __asm__ __volatile__("hint @pause"); + #endif +-#elif defined(__arm__) || defined(__aarch64__) ++#elif defined(__aarch64__) || (defined(__ARM_ARCH) && __ARM_ARCH > 6) || \ ++ defined(__ARM_ARCH_6K__) + #ifdef __CC_ARM + __yield(); + #else +-- +2.28.0 + diff --git a/package/libmdbx/0005-mdbx-load-fix-minor-false-positive-GCC-warning.patch b/package/libmdbx/0005-mdbx-load-fix-minor-false-positive-GCC-warning.patch new file mode 100644 index 0000000000..29d69e3faa --- /dev/null +++ b/package/libmdbx/0005-mdbx-load-fix-minor-false-positive-GCC-warning.patch @@ -0,0 +1,27 @@ +From 8d4e7994c0c5c0cf69326139717e324f90bff65b Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Mon, 5 Oct 2020 15:09:10 +0300 +Subject: [PATCH] mdbx-load: fix minor false-positive GCC warning. + +Change-Id: Ie75c793712d050e8d3da76a4d0a8df9b81dc5275 +Signed-off-by: Leonid Yuriev +--- + mdbx_load.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mdbx_load.c b/mdbx_load.c +index e5e72fc8f..54e179553 100644 +--- a/mdbx_load.c ++++ b/mdbx_load.c +@@ -318,7 +318,7 @@ static int readhdr(void) { + } + + for (int i = 0; dbflags[i].bit; i++) { +- bool value; ++ bool value = false; + if (valbool(dbuf.iov_base, dbflags[i].name, &value)) { + if (value) + dbi_flags |= dbflags[i].bit; +-- +2.28.0 + diff --git a/package/libmdbx/0006-mdbx-cmake-pthread-workaround-for-buggy-toolchain-cm.patch b/package/libmdbx/0006-mdbx-cmake-pthread-workaround-for-buggy-toolchain-cm.patch new file mode 100644 index 0000000000..37525cf0d5 --- /dev/null +++ b/package/libmdbx/0006-mdbx-cmake-pthread-workaround-for-buggy-toolchain-cm.patch @@ -0,0 +1,65 @@ +From 787eaaa373073e17f3a53658b085c255bc2c8ff8 Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Mon, 5 Oct 2020 19:12:20 +0300 +Subject: [PATCH] mdbx-cmake: pthread workaround for buggy + toolchain/cmake/buildroot. + +Change-Id: I0d95e783abbd10a63cd1595a9de50593e814a967 +Signed-off-by: Leonid Yuriev +--- + CMakeLists.txt | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95f116521..20a50a453 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,10 +173,27 @@ if(NOT CMAKE_BUILD_TYPE) + endif() + string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UPPERCASE) + ++set(CMAKE_THREAD_PREFER_PTHREAD TRUE) ++set(THREADS_PREFER_PTHREAD_FLAG TRUE) ++find_package(Threads REQUIRED) ++ + include(cmake/utils.cmake) + include(cmake/compiler.cmake) + include(cmake/profile.cmake) + ++# Workaround for `-pthread` toolchain/cmake bug ++if(NOT APPLE AND NOT MSVC ++ AND CMAKE_USE_PTHREADS_INIT AND NOT CMAKE_THREAD_LIBS_INIT ++ AND (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)) ++ check_compiler_flag("-pthread" CC_HAS_PTHREAD) ++ if(CC_HAS_PTHREAD AND NOT CMAKE_EXE_LINKER_FLAGS MATCHES "-pthread") ++ message(STATUS "Force add -pthread for linker flags to avoid troubles") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread") ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread") ++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread") ++ endif() ++endif() ++ + CHECK_FUNCTION_EXISTS(pow NOT_NEED_LIBM) + if(NOT_NEED_LIBM) + set(LIB_MATH "") +@@ -190,8 +207,6 @@ else() + endif() + endif() + +-find_package(Threads REQUIRED) +- + if(SUBPROJECT) + if(NOT DEFINED BUILD_SHARED_LIBS) + option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)" OFF) +@@ -541,7 +556,7 @@ macro(target_setup_options TARGET) + endmacro() + + macro(libmdbx_setup_libs TARGET MODE) +- target_link_libraries(${TARGET} ${MODE} ${CMAKE_THREAD_LIBS_INIT}) ++ target_link_libraries(${TARGET} ${MODE} Threads::Threads) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + target_link_libraries(${TARGET} ${MODE} ntdll.lib) + if(MDBX_NTDLL_EXTRA_IMPLIB AND MDBX_AVOID_CRT) +-- +2.28.0 + diff --git a/package/libmdbx/0007-mdbx-fix-pthread_yield-for-non-GLIBC.patch b/package/libmdbx/0007-mdbx-fix-pthread_yield-for-non-GLIBC.patch new file mode 100644 index 0000000000..5d7e83d4c7 --- /dev/null +++ b/package/libmdbx/0007-mdbx-fix-pthread_yield-for-non-GLIBC.patch @@ -0,0 +1,42 @@ +From 16d43332a9d28ba27aa3d127e8f6b77a87b2f5eb Mon Sep 17 00:00:00 2001 +From: Leonid Yuriev +Date: Mon, 5 Oct 2020 21:08:09 +0300 +Subject: [PATCH] mdbx: fix `pthread_yield()` for non-GLIBC. + +Change-Id: I080e37a42b62e524896dea8747e9f23e2fcd584f +Signed-off-by: Leonid Yuriev +--- + mdbx.c | 4 +++- + mdbx.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mdbx.c b/mdbx.c +index a9ba1ee85..ace6f2756 100644 +--- a/mdbx.c ++++ b/mdbx.c +@@ -777,7 +777,9 @@ static __always_inline void atomic_yield(void) { + defined(__mips64__) || defined(_M_MRX000) || defined(_MIPS_) || \ + defined(__MWERKS__) || defined(__sgi) + __asm__ __volatile__(".word 0x00000140"); +-#else ++#elif defined(__linux__) || defined(__gnu_linux__) || defined(_UNIX03_SOURCE) ++ sched_yield(); ++#elif (defined(_GNU_SOURCE) && __GLIBC_PREREQ(2, 1)) || defined(_OPEN_THREADS) + pthread_yield(); + #endif + } +diff --git a/mdbx.c b/mdbx.c +index 3509942dc..3af23ce0b 100644 +--- a/mdbx.c ++++ b/mdbx.c +@@ -119,6 +119,7 @@ + + #if defined(__linux__) || defined(__gnu_linux__) + #include ++#include + #include + #include + #endif /* Linux */ +-- +2.28.0 + diff --git a/package/libmdbx/Config.in b/package/libmdbx/Config.in new file mode 100644 index 0000000000..dc36f12348 --- /dev/null +++ b/package/libmdbx/Config.in @@ -0,0 +1,42 @@ +config BR2_PACKAGE_LIBMDBX + bool "libmdbx" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + help + One of the fastest compact key-value ACID database + without WAL. libmdbx has a specific set of properties + and capabilities, focused on creating unique lightweight + solutions. + + libmdbx surpasses the legendary LMDB in terms of + reliability, features and performance. + + https://github.com/erthink/libmdbx + +if BR2_PACKAGE_LIBMDBX + +config BR2_PACKAGE_LIBMDBX_TOOLS + bool "install tools" + help + Install libmdbx tools for checking, dump, restore + and show statistics of databases. + +config BR2_PACKAGE_LIBMDBX_CXX + bool "C++ API" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + Enable modern C++11/14/17/20 API for libmdbx. + +comment "libmdbx C++ support needs a toolchain w/ C++11, gcc >= 4.8" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +endif + +comment "libmdbx needs a toolchain w/ threads, gcc >= 4.4" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !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..f48cd81a7d --- /dev/null +++ b/package/libmdbx/libmdbx.hash @@ -0,0 +1,2 @@ +sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE +sha256 c7fb24381eb4d92f2e2edc17e577cb721269683c816c6cca307c58f6f346e786 libmdbx-amalgamated-0.9.1.tar.gz diff --git a/package/libmdbx/libmdbx.mk b/package/libmdbx/libmdbx.mk new file mode 100644 index 0000000000..be0c2d7b06 --- /dev/null +++ b/package/libmdbx/libmdbx.mk @@ -0,0 +1,24 @@ +################################################################################ +# +# libmdbx +# +################################################################################ + +LIBMDBX_VERSION = 0.9.1 +LIBMDBX_SOURCE = libmdbx-amalgamated-$(LIBMDBX_VERSION).tar.gz +LIBMDBX_SITE = https://github.com/erthink/libmdbx/releases/download/v$(LIBMDBX_VERSION) +LIBMDBX_SUPPORTS_IN_SOURCE_BUILD = NO +LIBMDBX_LICENSE = OLDAP-2.8 +LIBMDBX_LICENSE_FILES = LICENSE +LIBMDBX_REDISTRIBUTE = YES +LIBMDBX_STRIP_COMPONENTS = 0 +LIBMDBX_INSTALL_STAGING = YES + +LIBMDBX_CONF_OPTS = -DMDBX_INSTALL_MANPAGES=OFF -DBUILD_FOR_NATIVE_CPU=OFF \ + -DMDBX_INSTALL_STATIC=$(if $(BR2_STATIC_LIBS),ON,OFF) \ + -DMDBX_BUILD_SHARED_LIBRARY=$(if $(BR2_SHARED_LIBS),ON,OFF) \ + -DMDBX_BUILD_CXX=$(if $(BR2_PACKAGE_LIBMDBX_CXX),ON,OFF) \ + -DMDBX_BUILD_TOOLS=$(if $(BR2_PACKAGE_LIBMDBX_TOOLS),ON,OFF) \ + -DMDBX_LINK_TOOLS_NONSTATIC=$(if $(BR2_SHARED_LIBS),ON,OFF) + +$(eval $(cmake-package))