Fix build error on 3.0

  Fix hardcoding library path
  Remove Werror option.
  Fix the error of redefined varible.

Change-Id: I9272d63823a954c4f112b8077c939640293db368
Signed-off-by: Dong Junfeng <junfeng.dong@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 997fcc7..b3b92ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(heap-monitor C)
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
 SET(EXEC_PREFIX "\${prefix}")
 SET(PROJECT_NAME "${PROJECT_NAME}")
-SET(LIBDIR "\${exec_prefix}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}")
 SET(VERSION_MAJOR 0)
 SET(VERSION "${VERSION_MAJOR}.0.1")
@@ -22,7 +22,7 @@ FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -fno-builtin-malloc -O3 -g")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -fno-builtin-malloc -O3 -g")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}")
 
@@ -43,8 +43,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} "-lpthread")
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc")
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/heap-monitor.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "lib${PROJECT_NAME}")
 

diff --git a/packaging/libheap-monitor.spec b/packaging/libheap-monitor.spec
index eec6b95..16ff22a 100644 (file)
--- a/packaging/libheap-monitor.spec
+++ b/packaging/libheap-monitor.spec
@@ -23,11 +23,10 @@ Monitoring the heap usage to manage them safely.(dev)
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
-CFLAGS+="${CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -fno-builtin-malloc" make %{?jobs:-j%jobs}
+%cmake .
+CFLAGS+="${CFLAGS} -fvisibility=hidden -Wall -fno-builtin-malloc" make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
 %make_install
 mkdir -p %{buildroot}/%{_datarootdir}/license
 
@@ -43,5 +42,3 @@ mkdir -p %{buildroot}/%{_datarootdir}/license
 %defattr(-,root,root,-)
 %{_includedir}/heap-monitor/heap-monitor.h
 %{_libdir}/pkgconfig/*.pc
-
-# End of a file

diff --git a/src/heap-monitor.c b/src/heap-monitor.c
index 53e3f43..11a938c 100644 (file)
--- a/src/heap-monitor.c
+++ b/src/heap-monitor.c
@@ -550,8 +550,6 @@ static void unhook(void)
        }
 }
 
-void (*__malloc_initialize_hook)(void) = heap_monitor_init;
-
 static int iterator_cb(struct dl_phdr_info *info, size_t size, void *data)
 {
        struct target *target;