<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9a7a13c0a82e0ff23bc4e1d4335ef6c537f59a65">https://github.com/macports/macports-ports/commit/9a7a13c0a82e0ff23bc4e1d4335ef6c537f59a65</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9a7a13c0a82 leveldb: update to 1.23; claim maintainership
</span>9a7a13c0a82 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a7a13c0a82e0ff23bc4e1d4335ef6c537f59a65
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Sep 6 11:09:31 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> leveldb: update to 1.23; claim maintainership
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56288
</span>---
databases/leveldb/Portfile | 101 ++++++++++-----------
databases/leveldb/files/install_name.patch | 94 -------------------
.../leveldb/files/patch-build_detect_platform.diff | 23 -----
3 files changed, 46 insertions(+), 172 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/leveldb/Portfile b/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d919a02b5e..b2baa6c98ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/leveldb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,71 +1,62 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# When trying to build a universal variant, build_detect_platform script mistakenly can't find library snappy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# The following test fails for multiple archs (see https://llvm.org/bugs/show_bug.cgi?id=15403)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # Test whether Snappy library is installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# # https://code.google.com/p/snappy/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT 2>/dev/null <<EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# #include <snappy.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# int main() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We therefore use muniversal PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup muniversal 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google leveldb 1.23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories databases
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup google leveldb 1.20 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories databases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license BSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description A fast and lightweight key/value database library by Google
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description A fast and lightweight key/value database library by Google
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@catap korins.ky:kirill} openmaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dd72b89d356031709df9a41da2c31ea2e093361d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 154d804980d92b08d08dafff8e937ad79a45ef0fe87c9f5d69ea74690f85a933 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 223200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description A fast and lightweight key/value database library by Google
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:snappy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6a8834f071cd2866a5bee707094caea0f90274c0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9a37f8a6174f09bd622bc723b55881dc541cd50747cbd08831c2a82d620f6d76 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 242925
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/56164
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/56508
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles install_name.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-build_detect_platform.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:snappy
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.cxx}] && ${configure.cxx_stdlib} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Need O_CLOEXEC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLEVELDB_BUILD_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLEVELDB_BUILD_BENCHMARKS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant tmalloc description {use tmalloc from gperftools} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gperftools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it picks tmalloc when gperftools is enabled which leads to crashes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://trac.macports.org/ticket/56164
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://trac.macports.org/ticket/56288
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset tmalloc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts gperftools
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${configure.universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=${configure.cflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXFLAGS=${configure.cxxflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} -arch ${arch}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant rtti description {build with RTTI} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-fno-rtti|-frtti|" ${worksrcpath}/CMakeLists.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "CXXFLAGS=${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PATH=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT=-DNDEBUG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +rtti
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/include/leveldb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/include/helpers/memenv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 {*}[glob ${worksrcpath}/include/leveldb/*.h] ${destroot}${prefix}/include/leveldb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/helpers/memenv/memenv.h ${destroot}${prefix}/include/helpers/memenv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy {*}[glob ${worksrcpath}/out-shared/libleveldb*.dylib] ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 {*}[glob ${worksrcpath}/out-static/lib*.a] ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset rtti]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://github.com/google/leveldb/issues/731
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Before version 1.23 leveldb has RTTI and a lot of code uses typeid.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Version 1.23 disables RTTI which lead to broken things from plyvel to ceph.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We re-enable RTTI by default, if you wish to disable it switch off rtti variant by:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port upgrade --enforce-variants leveldb -rtti"
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/leveldb/files/install_name.patch b/databases/leveldb/files/install_name.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 142df6cf92b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/leveldb/files/install_name.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,94 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/google/leveldb/issues/412
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/google/leveldb/pull/413
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_detect_platform.orig 2017-03-01 18:08:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_detect_platform 2018-03-09 17:08:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CXX C++ Compiler path
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PLATFORM_LDFLAGS Linker flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PLATFORM_LIBS Libraries flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# PLATFORM_SHARED_EXT Extension for shared libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# PLATFORM_SHARED Set to 'true' if shared libraries shoull be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# built, empty otherwise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# PLATFORM_SHARED_BASE Base filename for shared libraries (before version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# PLATFORM_SHARED_EXT Extension for shared libraries (after version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # PLATFORM_SHARED_LDFLAGS Flags for building shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This flag is embedded just before the name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # of the shared library without intervening spaces
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +62,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_CXXFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_LDFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_LIBS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLATFORM_SHARED_EXT="so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_SHARED=true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_SHARED_BASE="libleveldb.so"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_SHARED_EXT=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_CFLAGS="-fPIC"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_VERSIONED=true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,7 +88,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM=OS_MACOSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_SHARED_EXT=dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PLATFORM_SHARED_BASE=libleveldb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PLATFORM_SHARED_EXT=.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORT_FILE=port/port_posix.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,7 +160,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORT_FILE=port/port_posix.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PORT_SSE_FILE=port/port_posix_sse.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_SHARED_EXT=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PLATFORM_SHARED=false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_LDFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_CFLAGS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SHARED_VERSIONED=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -250,6 +256,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_SSEFLAGS=$PLATFORM_SSEFLAGS" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "PLATFORM_SHARED=$PLATFORM_SHARED" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo "PLATFORM_SHARED_BASE=$PLATFORM_SHARED_BASE" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2017-03-01 18:08:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-03-09 17:14:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,13 +108,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default: all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Should we build shared libraries?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq ($(PLATFORM_SHARED_EXT),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ifeq ($(PLATFORM_SHARED),true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Many leveldb test apps use non-exported API's. Only build a subset for testing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_ALLOBJS := $(SHARED_LIBOBJECTS) $(SHARED_MEMENVOBJECTS) $(TESTHARNESS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SHARED_LIB1 = $(PLATFORM_SHARED_BASE)$(PLATFORM_SHARED_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(PLATFORM_SHARED_VERSIONED),true)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_LIB2 = $(SHARED_LIB1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_LIB3 = $(SHARED_LIB1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_LIBS = $(SHARED_LIB1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,9 +123,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Update db.h if you change these.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_VERSION_MAJOR = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_VERSION_MINOR = 20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SHARED_LIB2 = $(PLATFORM_SHARED_BASE).$(SHARED_VERSION_MAJOR)$(PLATFORM_SHARED_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SHARED_LIB3 = $(PLATFORM_SHARED_BASE).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)$(PLATFORM_SHARED_EXT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -137,7 +136,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif # PLATFORM_SHARED_EXT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif # PLATFORM_SHARED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/leveldb/files/patch-build_detect_platform.diff b/databases/leveldb/files/patch-build_detect_platform.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9876682bec7..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/leveldb/files/patch-build_detect_platform.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_detect_platform.orig 2017-03-01 18:08:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_detect_platform 2021-01-24 12:57:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,19 +213,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_LIBS="$PLATFORM_LIBS -lsnappy"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Test whether tcmalloc is available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -ltcmalloc 2>/dev/null <<EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int main() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "$?" = 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_LIBS="$PLATFORM_LIBS -ltcmalloc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $CXXOUTPUT 2>/dev/null
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Test if gcc SSE 4.2 is supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $CXX $CXXFLAGS -x c++ - -o $CXXOUTPUT -msse4.2 2>/dev/null <<EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int main() {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int main() { __builtin_ia32_crc32qi(0, 0); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$?" = 0 ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_SSEFLAGS="-msse4.2"
</span></pre><pre style='margin:0'>
</pre>