rpms/accumulo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 1.6.6

Browse source 
* Build using Apache Accumulo 1.6.6
* Update patches and pom modification macros for 1.6.6
* Drop conditionals for EOL Fedora releases
* Drop javadoc conditionals entirely
* Use https for upstream URLs
This commit is contained in:
Christopher Tubbs 2016-10-20 00:24:55 -04:00
commit a7319744d6
6 changed files with 32 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

6
native-code.patch
View file

@ -3,11 +3,11 @@ index 9ffeefe..102c253 100644
--- a/server/native/src/main/resources/Makefile
+++ b/server/native/src/main/resources/Makefile
@@ -26,7 +26,7 @@ ifeq ($(shell uname),Linux)
JAVA_HOME=$(shell dirname $$(dirname $$(readlink -ef $$(which javah))))
JAVA_HOME=$(shell dirname "$$(dirname "$$(readlink -ef "$$(which javah)")")")
endif
NATIVE_LIB := libaccumulo.so
- CXXFLAGS=-g -fPIC -shared -O3 -Wall -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS)
+ CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -Ijavah $(USERFLAGS)
- CXXFLAGS=-g -fPIC -shared -O3 -Wall -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)
+ CXXFLAGS=$(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -fPIC -shared -I'$(JAVA_HOME)'/include -I'$(JAVA_HOME)'/include/linux -Ijavah $(USERFLAGS)
endif
ifeq ($(shell uname),Darwin)