Skip to content
Permalink
Browse files

leveldb: Update to 1.20

Add gperftools dependency.

Closes: https://trac.macports.org/ticket/55584

Honor cxx_stdlib.

Closes: https://trac.macports.org/ticket/53104
  • Loading branch information
ryandesign committed Mar 10, 2018
1 parent 49f6083 commit e7838648d8264c2dc1d8f2881985d57915167051
Showing with 32 additions and 23 deletions.
  1. +19 −10 databases/leveldb/Portfile
  2. +13 −13 databases/leveldb/files/install_name.patch
@@ -14,40 +14,49 @@ PortGroup github 1.0
# We therefore use muniversal PortGroup
PortGroup muniversal 1.0

github.setup google leveldb 1.19 v
revision 1
github.setup google leveldb 1.20 v
categories databases
platforms darwin
license BSD
maintainers nomaintainer
description A fast and lightweight key/value database library by Google
long_description A fast and lightweight key/value database library by Google

checksums rmd160 9586c14604093fe2ca855539f7d69ce55c999da5 \
sha256 6835203e749f7f437f87f7fb788e96d0718f62ca28c0160a35f48d1ba17a8e7b
checksums rmd160 dd72b89d356031709df9a41da2c31ea2e093361d \
sha256 154d804980d92b08d08dafff8e937ad79a45ef0fe87c9f5d69ea74690f85a933 \
size 223200

depends_lib port:snappy
depends_lib port:snappy \
port:gperftools

patchfiles install_name.patch

use_configure no

if {[string match *clang* ${configure.cxx}]} {
configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}

if { [variant_isset universal] } {
foreach arch ${configure.universal_archs} {
set merger_build_env(${arch}) "CFLAGS=\"-arch ${arch}\" CXXFLAGS=\"-arch ${arch}\" LDFLAGS=\"-arch ${arch} -L${prefix}/lib\""
lappend merger_build_env(${arch}) \
CFLAGS="${configure.cflags} -arch ${arch}" \
CXXFLAGS="${configure.cxxflags} -arch ${arch}" \
LDFLAGS="${configure.ldflags} -arch ${arch}"
}
} else {
build.env-append \
CFLAGS="[get_canonical_archflags cc]" \
CXXFLAGS="[get_canonical_archflags cxx]" \
LDFLAGS="[get_canonical_archflags ld] -L${prefix}/lib"
CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
}

build.env-append \
INSTALL_PATH=${prefix}/lib \
CC="${configure.cc}" \
CXX="${configure.cxx}" \
OPT="${configure.optflags} -DNDEBUG"
OPT="-DNDEBUG"

# muniversal build requires Makefile
post-extract {
@@ -1,7 +1,7 @@
https://github.com/google/leveldb/issues/412
https://github.com/google/leveldb/pull/413
--- build_detect_platform.orig 2016-08-11 09:33:30.000000000 -0500
+++ build_detect_platform 2016-10-16 16:31:41.000000000 -0500
--- build_detect_platform.orig 2017-03-01 18:08:02.000000000 -0600
+++ build_detect_platform 2018-03-09 17:08:26.000000000 -0600
@@ -8,7 +8,10 @@
# CXX C++ Compiler path
# PLATFORM_LDFLAGS Linker flags
@@ -25,7 +25,7 @@ https://github.com/google/leveldb/pull/413
PLATFORM_SHARED_LDFLAGS="-shared -Wl,-soname -Wl,"
PLATFORM_SHARED_CFLAGS="-fPIC"
PLATFORM_SHARED_VERSIONED=true
@@ -81,7 +86,8 @@
@@ -83,7 +88,8 @@
Darwin)
PLATFORM=OS_MACOSX
COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
@@ -35,27 +35,27 @@ https://github.com/google/leveldb/pull/413
[ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
PLATFORM_SHARED_LDFLAGS="-dynamiclib -install_name $INSTALL_PATH/"
PORT_FILE=port/port_posix.cc
@@ -142,7 +148,7 @@
COMMON_FLAGS="$MEMCMP_FLAG -DOS_MACOSX"
@@ -154,7 +160,7 @@
[ -z "$INSTALL_PATH" ] && INSTALL_PATH=`pwd`
PORT_FILE=port/port_posix.cc
PORT_SSE_FILE=port/port_posix_sse.cc
- PLATFORM_SHARED_EXT=
+ PLATFORM_SHARED=false
PLATFORM_SHARED_LDFLAGS=
PLATFORM_SHARED_CFLAGS=
PLATFORM_SHARED_VERSIONED=
@@ -222,6 +228,8 @@
echo "PLATFORM_LIBS=$PLATFORM_LIBS" >> $OUTPUT
@@ -250,6 +256,8 @@
echo "PLATFORM_CCFLAGS=$PLATFORM_CCFLAGS" >> $OUTPUT
echo "PLATFORM_CXXFLAGS=$PLATFORM_CXXFLAGS" >> $OUTPUT
echo "PLATFORM_SSEFLAGS=$PLATFORM_SSEFLAGS" >> $OUTPUT
+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
--- Makefile.orig 2016-08-11 09:33:30.000000000 -0500
+++ Makefile 2016-10-16 16:41:58.000000000 -0500
@@ -107,13 +107,13 @@
--- Makefile.orig 2017-03-01 18:08:02.000000000 -0600
+++ Makefile 2018-03-09 17:14:53.000000000 -0600
@@ -108,13 +108,13 @@
default: all

# Should we build shared libraries?
@@ -71,10 +71,10 @@ https://github.com/google/leveldb/pull/413
SHARED_LIB2 = $(SHARED_LIB1)
SHARED_LIB3 = $(SHARED_LIB1)
SHARED_LIBS = $(SHARED_LIB1)
@@ -122,9 +122,8 @@
@@ -123,9 +123,8 @@
# Update db.h if you change these.
SHARED_VERSION_MAJOR = 1
SHARED_VERSION_MINOR = 19
SHARED_VERSION_MINOR = 20
-SHARED_LIB1 = libleveldb.$(PLATFORM_SHARED_EXT)
-SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
-SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR)
@@ -83,7 +83,7 @@ https://github.com/google/leveldb/pull/413
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)
@@ -136,7 +136,7 @@
@@ -137,7 +136,7 @@
$(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS)
$(CXX) $(LDFLAGS) $(PLATFORM_SHARED_LDFLAGS)$(SHARED_LIB2) $(SHARED_LIBOBJECTS) -o $(SHARED_OUTDIR)/$(SHARED_LIB3) $(LIBS)

0 comments on commit e783864

Please sign in to comment.
You can’t perform that action at this time.