RRDtool no longer has a _th library as of 1.6

OpenNMS · Oct 21, 2016 · de80f19 · de80f19
1 parent db44ca4
commit de80f19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/java/src/main/java/org/opennms/netmgt/rrd/jrrd2/impl/JRrd2Jni.java b/java/src/main/java/org/opennms/netmgt/rrd/jrrd2/impl/JRrd2Jni.java
@@ -48,7 +48,7 @@
 public class JRrd2Jni implements JRrd2 {
 
     /* A suggested by http://linux.die.net/man/1/rrdthreads:
-     *   Every thread SHOULD call "rrd_get_context()" before its first call to any "librrd_th" function
+     *   Every thread SHOULD call "rrd_get_context()" before its first call to any "librrd" function
      */
     private static final ThreadLocal<Void> rrdContext =
         new ThreadLocal<Void>() {

diff --git a/jni/CMakeLists.txt b/jni/CMakeLists.txt
@@ -45,9 +45,9 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 add_library(jrrd2 MODULE src/rrd_jinterface.c)
 
 IF(APPLE)
-	SET_TARGET_PROPERTIES(jrrd2 PROPERTIES PREFIX "lib" SUFFIX ".jnilib")
+	SET_TARGET_PROPERTIES(jrrd2 PROPERTIES PREFIX "lib" SUFFIX ".jnilib" INSTALL_NAME_DIR "/usr/local/lib")
 ELSEIF(WIN32)
 	SET_TARGET_PROPERTIES(jrrd2 PROPERTIES PREFIX "" SUFFIX ".dll")
 ENDIF(APPLE)
 
-target_link_libraries(jrrd2 rrd_th)
+target_link_libraries(jrrd2 rrd)
diff --git a/jrrd2.spec b/jrrd2.spec
@@ -21,7 +21,7 @@ BuildRequires: cmake >= 2.6.4
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: pkgconfig
-BuildRequires: rrdtool-devel >= 1.5.0
+BuildRequires: rrdtool-devel >= 1.6.0
 
 %if 0%{?fedora} >= 21
 BuildRequires: java-1.8.0-openjdk-devel