From 541c36a3e9a9ebd6f5e7d961ae56594e62890aaa Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 16 Jun 2012 20:21:57 +0000 Subject: - Update to 1.5.0 Changes: http://code.google.com/p/leveldb/source/list http://code.google.com/p/leveldb/source/detail?r=dd0d562b4d4fbd07db6a44f9e221f8d368fee8e4 http://code.google.com/p/leveldb/source/detail?r=b914f91b1049699aa2d0e08660aa9246b87bdcb7 http://code.google.com/p/leveldb/source/detail?r=075a35a6d390167b77b687e067dd0ba593e7f624 http://code.google.com/p/leveldb/source/detail?r=85584d497e7b354853b72f450683d59fcf6b9c5c http://code.google.com/p/leveldb/source/detail?r=bc1ee4d25e09b04e074db330a41f54ef4af0e31b http://code.google.com/p/leveldb/source/detail?r=a1ad4d1995dc8efeb0d3d7a40b8bb63c9b7c8259 Submitted by: vanilla --- databases/leveldb/files/patch-Makefile | 43 ------------------------- databases/leveldb/files/patch-port-port_posix.h | 14 ++++++++ 2 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 databases/leveldb/files/patch-Makefile create mode 100644 databases/leveldb/files/patch-port-port_posix.h (limited to 'databases/leveldb/files') diff --git a/databases/leveldb/files/patch-Makefile b/databases/leveldb/files/patch-Makefile deleted file mode 100644 index cb63d0f4790d..000000000000 --- a/databases/leveldb/files/patch-Makefile +++ /dev/null @@ -1,43 +0,0 @@ ---- Makefile.orig 2011-12-07 20:27:41.000000000 +0800 -+++ Makefile 2011-12-07 20:53:25.265313302 +0800 -@@ -37,7 +37,7 @@ - GOOGLE_PERFTOOLS_LDFLAGS= - endif - --CFLAGS = -c -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS) -+CFLAGS += -c -I. -I./include $(PORT_CFLAGS) $(PLATFORM_CFLAGS) $(OPT) $(SNAPPY_CFLAGS) -fPIC - - LDFLAGS += $(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS) - -@@ -104,15 +104,18 @@ - BENCHMARKS = db_bench_sqlite3 db_bench_tree_db - - LIBRARY = libleveldb.a -+SHARED_LIBRARY = libleveldb.so -+SHARED_LIBRARY_VER = 0 - MEMENVLIBRARY = libmemenv.a - --all: $(LIBRARY) -+SHARED_LIBOBJECTS = $(LIBOBJECTS:.o=.so) -+all: $(LIBRARY) $(SHARED_LIBRARY) - - check: $(PROGRAMS) $(TESTS) - for t in $(TESTS); do echo "***** Running $$t"; ./$$t || exit 1; done - - clean: -- -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o -+ -rm -f $(PROGRAMS) $(BENCHMARKS) $(LIBRARY) $(SHARED_LIBRARY) $(MEMENVLIBRARY) */*.o */*/*.o ios-x86/*/*.o ios-arm/*/*.o - -rm -rf ios-x86/* ios-arm/* - -rm build_config.mk - -@@ -120,6 +123,10 @@ - rm -f $@ - $(AR) -rs $@ $(LIBOBJECTS) - -+$(SHARED_LIBRARY): $(LIBOBJECTS) -+ rm -f $@ -+ $(CXX) -shared -Wl,-soname,$@.$(SHARED_LIBRARY_VER) -o $@.$(SHARED_LIBRARY_VER) $(LDFLAGS) $(LIBOBJECTS) -+ - db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) - $(CXX) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ - diff --git a/databases/leveldb/files/patch-port-port_posix.h b/databases/leveldb/files/patch-port-port_posix.h new file mode 100644 index 000000000000..17df518f59c2 --- /dev/null +++ b/databases/leveldb/files/patch-port-port_posix.h @@ -0,0 +1,14 @@ +--- port/port_posix.h.orig 2012-05-31 00:56:59.000000000 +0800 ++++ port/port_posix.h 2012-06-15 15:07:41.274868153 +0800 +@@ -25,6 +25,11 @@ + defined(OS_DRAGONFLYBSD) || defined(OS_ANDROID) + #include + #include ++ #ifdef _LITTLE_ENDIAN ++ #define PLATFORM_IS_LITTLE_ENDIAN true ++ #else ++ #define PLATFORM_IS_LITTLE_ENDIAN false ++ #endif + #else + #include + #endif -- cgit v1.2.3