|
|
@@ -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) |
|
|
|
|
|
|