Compare commits

...

2 Commits

Author SHA1 Message Date
Igor Canadi 978b5c17c0 Bump the version to 3.11.1 2015-06-03 13:21:52 -04:00
DerekSchenk 4b9585f5e3 Add LDFLAGS to Java static library
Includes the LDFLAGS so that the correct libraries will be linked.  This links rt to resolve the issue https://github.com/facebook/rocksdb/issues/606.
2015-06-03 13:20:49 -04:00
3 changed files with 7 additions and 2 deletions
+5
View File
@@ -1,5 +1,10 @@
# Rocksdb Change Log
## 3.11.1 (6/1/2015)
### Changes
* Just a single change to fix the Java linking (github issue #606)
## 3.11.0 (5/19/2015)
### New Features
+1 -1
View File
@@ -939,7 +939,7 @@ rocksdbjavastatic: $(java_libobjects) libz.a libbz2.a libsnappy.a liblz4.a
$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC \
-o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
$(java_libobjects) $(COVERAGEFLAGS) \
libz.a libbz2.a libsnappy.a liblz4.a
libz.a libbz2.a libsnappy.a liblz4.a $(LDFLAGS)
cd java/target;strip -S -x $(ROCKSDBJNILIB)
cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md
cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)
+1 -1
View File
@@ -6,7 +6,7 @@
#define ROCKSDB_MAJOR 3
#define ROCKSDB_MINOR 11
#define ROCKSDB_PATCH 0
#define ROCKSDB_PATCH 1
// Do not use these. We made the mistake of declaring macros starting with
// double underscore. Now we have to live with our choice. We'll deprecate these