|
 |
9b803b8 |
diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile
|
|
|
68ce91e |
index 5434356..3911f57 100644
|
|
|
9b803b8 |
--- a/server/native/src/main/resources/Makefile
|
|
|
9b803b8 |
+++ b/server/native/src/main/resources/Makefile
|
|
|
fc92176 |
@@ -30,7 +30,7 @@ ifeq ($(shell uname),Linux)
|
|
|
fc92176 |
JAVA_HOME=$(shell dirname "$$(dirname "$$(readlink -e "$$(which javah)")")")
|
|
|
9b803b8 |
endif
|
|
|
9b803b8 |
NATIVE_LIB := libaccumulo.so
|
|
|
a731974 |
- CXXFLAGS=-g -fPIC -shared -O3 -Wall -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)
|
|
|
a731974 |
+ CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)
|
|
|
9b803b8 |
endif
|
|
|
9b803b8 |
|
|
|
9b803b8 |
ifeq ($(shell uname),Darwin)
|
|
|
40b9a95 |
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
|
|
|
68ce91e |
index 536d0a2..5ed16bb 100644
|
|
|
40b9a95 |
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
|
|
|
40b9a95 |
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
|
|
|
68ce91e |
@@ -73,7 +73,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
|
|
|
40b9a95 |
static {
|
|
|
40b9a95 |
// Check standard directories
|
|
|
68ce91e |
List<File> directories = new ArrayList<>(
|
|
|
68ce91e |
- Arrays.asList(new File[] {new File("/usr/lib64"), new File("/usr/lib")}));
|
|
|
68ce91e |
+ Arrays.asList(new File[] {new File("/usr/lib64/accumulo"), new File("/usr/lib/accumulo")}));
|
|
|
40b9a95 |
// Check in ACCUMULO_HOME location, too
|
|
|
40b9a95 |
String envAccumuloHome = System.getenv("ACCUMULO_HOME");
|
|
|
40b9a95 |
if (envAccumuloHome != null) {
|