72 lines
3.1 KiB
Diff
72 lines
3.1 KiB
Diff
--- cmake/modules/FindDWARF.cmake.orig
|
|
+++ cmake/modules/FindDWARF.cmake
|
|
@@ -37,14 +37,9 @@
|
|
PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
|
|
)
|
|
|
|
-find_library(EBL_LIBRARY
|
|
- NAMES ebl
|
|
- PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 ~/usr/local/lib ~/usr/local/lib64
|
|
-)
|
|
-
|
|
-if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
|
|
+if (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
|
|
set(DWARF_FOUND TRUE)
|
|
- set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY} ${EBL_LIBRARY})
|
|
+ set(DWARF_LIBRARIES ${DWARF_LIBRARY} ${ELF_LIBRARY})
|
|
|
|
set(CMAKE_REQUIRED_LIBRARIES ${DWARF_LIBRARIES})
|
|
# check if libdw have the dwfl_module_build_id routine, i.e. if it supports the buildid
|
|
@@ -52,10 +47,10 @@
|
|
# in distributions such as fedora). We do it against libelf because, IIRC, some distros
|
|
# include libdw linked statically into libelf.
|
|
check_library_exists(elf dwfl_module_build_id "" HAVE_DWFL_MODULE_BUILD_ID)
|
|
-else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
|
|
+else (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
|
|
set(DWARF_FOUND FALSE)
|
|
set(DWARF_LIBRARIES)
|
|
-endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY AND EBL_LIBRARY)
|
|
+endif (DWARF_INCLUDE_DIR AND LIBDW_INCLUDE_DIR AND DWARF_LIBRARY AND ELF_LIBRARY)
|
|
|
|
if (DWARF_FOUND)
|
|
if (NOT DWARF_FIND_QUIETLY)
|
|
@@ -63,7 +58,6 @@
|
|
message(STATUS "Found elfutils/libdw.h header: ${LIBDW_INCLUDE_DIR}")
|
|
message(STATUS "Found libdw library: ${DWARF_LIBRARY}")
|
|
message(STATUS "Found libelf library: ${ELF_LIBRARY}")
|
|
- message(STATUS "Found libebl library: ${EBL_LIBRARY}")
|
|
endif (NOT DWARF_FIND_QUIETLY)
|
|
else (DWARF_FOUND)
|
|
if (DWARF_FIND_REQUIRED)
|
|
@@ -73,9 +67,9 @@
|
|
find_path(FEDORA fedora-release /etc)
|
|
find_path(REDHAT redhat-release /etc)
|
|
if (FEDORA OR REDHAT)
|
|
- if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
|
|
+ if (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
|
|
message(STATUS "Please install the elfutils-devel package")
|
|
- endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR OR NOT EBL_LIBRARY)
|
|
+ endif (NOT DWARF_INCLUDE_DIR OR NOT LIBDW_INCLUDE_DIR)
|
|
if (NOT DWARF_LIBRARY)
|
|
message(STATUS "Please install the elfutils-libs package")
|
|
endif (NOT DWARF_LIBRARY)
|
|
@@ -89,9 +83,6 @@
|
|
if (NOT LIBDW_INCLUDE_DIR)
|
|
message(STATUS "Could NOT find libdw include dir")
|
|
endif (NOT LIBDW_INCLUDE_DIR)
|
|
- if (NOT EBL_LIBRARY)
|
|
- message(STATUS "Could NOT find libebl library")
|
|
- endif (NOT EBL_LIBRARY)
|
|
if (NOT DWARF_LIBRARY)
|
|
message(STATUS "Could NOT find libdw library")
|
|
endif (NOT DWARF_LIBRARY)
|
|
@@ -103,7 +94,7 @@
|
|
endif (DWARF_FIND_REQUIRED)
|
|
endif (DWARF_FOUND)
|
|
|
|
-mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY EBL_LIBRARY)
|
|
+mark_as_advanced(DWARF_INCLUDE_DIR LIBDW_INCLUDE_DIR DWARF_LIBRARY ELF_LIBRARY)
|
|
include_directories(${DWARF_INCLUDE_DIR} ${LIBDW_INCLUDE_DIR})
|
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
|
|
|