diff --git a/databases/mdbx/Makefile b/databases/mdbx/Makefile index 08a32ef10f56..7dda37bdc2f6 100644 --- a/databases/mdbx/Makefile +++ b/databases/mdbx/Makefile @@ -1,36 +1,33 @@ PORTNAME= mdbx -PORTVERSION= 0.11.2 -DISTVERSIONPREFIX= v +PORTVERSION= 0.11.9 CATEGORIES= databases MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/ -DISTNAME= ${GH_PROJECT}-amalgamated-${DISTVERSION} +MASTER_SITES= https://libmdbx.dqdkfa.ru/release/ +DISTNAME= libmdbx-amalgamated-${DISTVERSION} MAINTAINER= mahlon@martini.nu COMMENT= Lightning Memory-Mapped Database (Extended) LICENSE= OPENLDAP LICENSE_NAME= OpenLDAP Public License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= gmake -# No USE_GITHUB, we want the amalgamated build. -GH_ACCOUNT= erthink -GH_PROJECT= libmdbx USE_LDCONFIG= yes MAKEFILE= GNUmakefile MAKE_ARGS= mdbx tools CFLAGS+= -Wall -Werror -Wextra -Wpedantic -ffunction-sections \ -fPIC -fvisibility=hidden -std=gnu11 -pthread -Wno-error=attributes NO_WRKSUBDIR= yes PLIST_SUB= VERSION=${PORTVERSION} post-install: ${RLN} libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so ${RLN} libmdbx.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libmdbx.so.0 .include diff --git a/databases/mdbx/distinfo b/databases/mdbx/distinfo index b47d4c887162..f872a795def7 100644 --- a/databases/mdbx/distinfo +++ b/databases/mdbx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639163729 -SHA256 (libmdbx-amalgamated-0.11.2.tar.gz) = efe64856e934621adf104385fad788e679c41e2df3eae96ab35caf19403c75e2 -SIZE (libmdbx-amalgamated-0.11.2.tar.gz) = 664883 +TIMESTAMP = 1660003184 +SHA256 (libmdbx-amalgamated-0.11.9.tar.gz) = 8feb391155de28b0ec8d6f93817b3f6ed3318a7bd7047d212fd24ba59e287a81 +SIZE (libmdbx-amalgamated-0.11.9.tar.gz) = 689520 diff --git a/databases/mdbx/files/patch-GNUmakefile b/databases/mdbx/files/patch-GNUmakefile index 478c5ef0964c..67b0d11d05b5 100644 --- a/databases/mdbx/files/patch-GNUmakefile +++ b/databases/mdbx/files/patch-GNUmakefile @@ -1,42 +1,42 @@ ---- GNUmakefile.orig 2021-10-13 09:17:02.000000000 -0700 -+++ GNUmakefile 2021-10-21 14:35:08.340353000 -0700 -@@ -13,7 +13,7 @@ - # in README and source code (see src/options.h) if you do. +--- GNUmakefile.orig 2022-08-02 10:17:33 UTC ++++ GNUmakefile +@@ -9,7 +9,7 @@ + # Basic internal definitios. For a customizable variables and options see below. # - --SHELL := env bash -+SHELL := env sh - - # install sandbox - DESTDIR ?= -@@ -54,7 +54,7 @@ - *) echo so;; + $(info // The GNU Make $(MAKE_VERSION)) +-SHELL := $(shell env bash -c 'echo $$BASH') ++SHELL := sh + MAKE_VERx3 := $(shell printf "%3s%3s%3s" $(subst ., ,$(MAKE_VERSION))) + make_lt_3_81 := $(shell expr "$(MAKE_VERx3)" "<" " 3 81") + ifneq ($(make_lt_3_81),0) +@@ -117,7 +117,7 @@ define uname2libs esac endef + -SO_SUFFIX := $(shell $(uname2sosuffix)) -+SO_SUFFIX := so.0.11.2 ++SO_SUFFIX := so.0.11.9 HEADERS := mdbx.h mdbx.h++ LIBRARIES := libmdbx.a libmdbx.$(SO_SUFFIX) TOOLS := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop -@@ -209,16 +209,11 @@ +@@ -284,16 +284,11 @@ mdbx_%.static-lto: mdbx_%.c config.h mdbx.c mdbx.h install: $(LIBRARIES) $(TOOLS) $(HEADERS) @echo ' INSTALLING...' - $(QUIET)mkdir -p $(DESTDIR)$(prefix)/bin$(suffix) && \ - $(INSTALL) -p $(EXE_INSTALL_FLAGS) $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix)/ && \ - mkdir -p $(DESTDIR)$(prefix)/lib$(suffix)/ && \ - $(INSTALL) -p $(EXE_INSTALL_FLAGS) $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix)/ && \ - mkdir -p $(DESTDIR)$(prefix)/lib$(suffix)/ && \ - $(INSTALL) -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix)/ && \ - mkdir -p $(DESTDIR)$(prefix)/include/ && \ - $(INSTALL) -p -m 444 $(HEADERS) $(DESTDIR)$(prefix)/include/ && \ - mkdir -p $(DESTDIR)$(mandir)/man1/ && \ - $(INSTALL) -p -m 444 $(addprefix $(MAN_SRCDIR), $(MANPAGES)) $(DESTDIR)$(mandir)/man1/ + install -p -s $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix) && \ + install -p -s $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix) && \ + install -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix) && \ + install -p -m 444 $(HEADERS) $(DESTDIR)$(prefix)/include && \ + install -p -m 444 $(addprefix $(MAN_SRCDIR), $(MANPAGES)) $(DESTDIR)$(mandir)/man1 install-strip: EXE_INSTALL_FLAGS = -s install-strip: install diff --git a/databases/mdbx/files/patch-mdbx.h++ b/databases/mdbx/files/patch-mdbx.h++ new file mode 100644 index 000000000000..51538c655c60 --- /dev/null +++ b/databases/mdbx/files/patch-mdbx.h++ @@ -0,0 +1,11 @@ +--- mdbx.h++.orig 2022-08-02 10:17:33 UTC ++++ mdbx.h++ +@@ -23,6 +23,8 @@ + + #pragma once + ++#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM ++ + /* Workaround for modern libstdc++ with CLANG < 4.x */ + #if defined(__SIZEOF_INT128__) && !defined(__GLIBCXX_TYPE_INT_N_0) && \ + defined(__clang__) && __clang_major__ < 4