<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e7838648d8264c2dc1d8f2881985d57915167051">https://github.com/macports/macports-ports/commit/e7838648d8264c2dc1d8f2881985d57915167051</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 e783864 leveldb: Update to 1.20
</span>e783864 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e7838648d8264c2dc1d8f2881985d57915167051
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Mar 9 18:14:14 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> leveldb: Update to 1.20
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add gperftools dependency.
</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/55584
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Honor cxx_stdlib.
</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/53104
</span>---
databases/leveldb/Portfile | 29 +++++++++++++++++++----------
databases/leveldb/files/install_name.patch | 26 +++++++++++++-------------
2 files changed, 32 insertions(+), 23 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 8817a04..75ae19c 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;'>@@ -14,8 +14,7 @@ PortGroup github 1.0
</span> # We therefore use muniversal PortGroup
PortGroup muniversal 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup google leveldb 1.19 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup google leveldb 1.20 v
</span> categories databases
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,31 +22,41 @@ maintainers nomaintainer
</span> description A fast and lightweight key/value database library by Google
long_description A fast and lightweight key/value database library by Google
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9586c14604093fe2ca855539f7d69ce55c999da5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6835203e749f7f437f87f7fb788e96d0718f62ca28c0160a35f48d1ba17a8e7b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dd72b89d356031709df9a41da2c31ea2e093361d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 154d804980d92b08d08dafff8e937ad79a45ef0fe87c9f5d69ea74690f85a933 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 223200
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:snappy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:snappy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gperftools
</span>
patchfiles install_name.patch
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.cxx}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -stdlib=${configure.cxx_stdlib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set merger_build_env(${arch}) "CFLAGS=\"-arch ${arch}\" CXXFLAGS=\"-arch ${arch}\" LDFLAGS=\"-arch ${arch} -L${prefix}/lib\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_build_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} -arch ${arch}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} -arch ${arch}"
</span> }
} else {
build.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="[get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS="[get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="[get_canonical_archflags ld] -L${prefix}/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</span> }
build.env-append \
INSTALL_PATH=${prefix}/lib \
CC="${configure.cc}" \
CXX="${configure.cxx}" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT="${configure.optflags} -DNDEBUG"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT="-DNDEBUG"
</span>
# muniversal build requires Makefile
post-extract {
<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><span style='display:block; white-space:pre;color:#808080;'>index 8c05fa6..142df6c 100644
</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;'>+++ b/databases/leveldb/files/install_name.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> https://github.com/google/leveldb/issues/412
https://github.com/google/leveldb/pull/413
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- build_detect_platform.orig 2016-08-11 09:33:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build_detect_platform 2016-10-16 16:31:41.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build_detect_platform.orig 2017-03-01 18:08:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build_detect_platform 2018-03-09 17:08:26.000000000 -0600
</span> @@ -8,7 +8,10 @@
# CXX C++ Compiler path
# PLATFORM_LDFLAGS Linker flags
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ https://github.com/google/leveldb/pull/413
</span> PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
PLATFORM_SHARED_CFLAGS="-fPIC"
PLATFORM_SHARED_VERSIONED=true
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +86,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +88,8 @@
</span> Darwin)
PLATFORM=OS_MACOSX
COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,27 +35,27 @@ https://github.com/google/leveldb/pull/413
</span> [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/"
PORT_FILE=port/port_posix.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -142,7 +148,7 @@
</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:#e0ffe0;'>+@@ -154,7 +160,7 @@
</span> [ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
PORT_FILE=port/port_posix.cc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PORT_SSE_FILE=port/port_posix_sse.cc
</span> - PLATFORM_SHARED_EXT=
+ PLATFORM_SHARED=false
PLATFORM_SHARED_LDFLAGS=
PLATFORM_SHARED_CFLAGS=
PLATFORM_SHARED_VERSIONED=
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,6 +228,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "PLATFORM_LIBS=$PLATFORM_LIBS" >> $OUTPUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -250,6 +256,8 @@
</span> echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "PLATFORM_SSEFLAGS=$PLATFORM_SSEFLAGS" >> $OUTPUT
</span> +echo "PLATFORM_SHARED=$PLATFORM_SHARED" >> $OUTPUT
+echo "PLATFORM_SHARED_BASE=$PLATFORM_SHARED_BASE" >> $OUTPUT
echo "PLATFORM_SHARED_CFLAGS=$PLATFORM_SHARED_CFLAGS" >> $OUTPUT
echo "PLATFORM_SHARED_EXT=$PLATFORM_SHARED_EXT" >> $OUTPUT
echo "PLATFORM_SHARED_LDFLAGS=$PLATFORM_SHARED_LDFLAGS" >> $OUTPUT
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2016-08-11 09:33:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2016-10-16 16:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -107,13 +107,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2017-03-01 18:08:02.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-03-09 17:14:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,13 +108,13 @@
</span> default: all
# Should we build shared libraries?
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,10 +71,10 @@ https://github.com/google/leveldb/pull/413
</span> SHARED_LIB2 = $(SHARED_LIB1)
SHARED_LIB3 = $(SHARED_LIB1)
SHARED_LIBS = $(SHARED_LIB1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -122,9 +122,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,9 +123,8 @@
</span> # Update db.h if you change these.
SHARED_VERSION_MAJOR = 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SHARED_VERSION_MINOR = 19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHARED_VERSION_MINOR = 20
</span> -SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
-SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
-SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ https://github.com/google/leveldb/pull/413
</span> SHARED_LIBS = $(SHARED_OUTDIR)/$(SHARED_LIB1) $(SHARED_OUTDIR)/$(SHARED_LIB2) $(SHARED_OUTDIR)/$(SHARED_LIB3)
$(SHARED_OUTDIR)/$(SHARED_LIB1): $(SHARED_OUTDIR)/$(SHARED_LIB3)
ln -fs $(SHARED_LIB3) $(SHARED_OUTDIR)/$(SHARED_LIB1)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +136,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +136,7 @@
</span> $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)
</pre><pre style='margin:0'>
</pre>