diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2011-12-07 14:04:16 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2011-12-07 14:04:16 +0000 |
| commit | 675bdb95377b023b46b973015fac244f7de81743 (patch) | |
| tree | d32282abf4741afc1a332b89cc613dca9db0dc94 /databases/leveldb/files | |
| parent | 09078f80fbc12a2387d40f1e7ae279625a3e7efa (diff) | |
| download | ports-675bdb95377b023b46b973015fac244f7de81743.tar.gz ports-675bdb95377b023b46b973015fac244f7de81743.zip | |
- Update to 1.2.20111130
Changes: http://code.google.com/p/leveldb/source/list
http://code.google.com/p/leveldb/source/detail?r=c8c5866a86c8d4a3e80d8708d14a06776fb683d1
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=287018
Diffstat (limited to 'databases/leveldb/files')
| -rw-r--r-- | databases/leveldb/files/patch-Makefile | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/databases/leveldb/files/patch-Makefile b/databases/leveldb/files/patch-Makefile index 72826e21186b..cb63d0f4790d 100644 --- a/databases/leveldb/files/patch-Makefile +++ b/databases/leveldb/files/patch-Makefile @@ -1,15 +1,6 @@ ---- Makefile.orig 2011-11-21 14:58:22.000000000 +0800 -+++ Makefile 2011-11-21 15:12:50.189222302 +0800 -@@ -2,7 +2,7 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. See the AUTHORS file for names of contributors. - --CC = g++ -+CC ?= g++ - - #----------------------------------------------- - # Uncomment exactly one of the lines labelled (A), (B), and (C) below -@@ -36,7 +36,7 @@ +--- 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 @@ -18,7 +9,7 @@ LDFLAGS += $(PLATFORM_LDFLAGS) $(SNAPPY_LDFLAGS) $(GOOGLE_PERFTOOLS_LDFLAGS) -@@ -103,15 +103,18 @@ +@@ -104,15 +104,18 @@ BENCHMARKS = db_bench_sqlite3 db_bench_tree_db LIBRARY = libleveldb.a @@ -39,14 +30,14 @@ -rm -rf ios-x86/* ios-arm/* -rm build_config.mk -@@ -119,6 +122,10 @@ +@@ -120,6 +123,10 @@ rm -f $@ $(AR) -rs $@ $(LIBOBJECTS) +$(SHARED_LIBRARY): $(LIBOBJECTS) + rm -f $@ -+ $(CC) -shared -Wl,-soname,$@.$(SHARED_LIBRARY_VER) -o $@.$(SHARED_LIBRARY_VER) $(LDFLAGS) $(LIBOBJECTS) ++ $(CXX) -shared -Wl,-soname,$@.$(SHARED_LIBRARY_VER) -o $@.$(SHARED_LIBRARY_VER) $(LDFLAGS) $(LIBOBJECTS) + db_bench: db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) - $(CC) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ + $(CXX) $(LDFLAGS) db/db_bench.o $(LIBOBJECTS) $(TESTUTIL) -o $@ |