diff options
| author |   Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com> | 2018-11-05 08:18:47 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-11-05 08:48:04 -0800 |
| commit | c90572b2f6f387f26e1e9e2a92aa1641513679d9 (patch) | |
| tree | b6f942d9263b3caf3f4ba905e73f9808a9fdd8b5 /meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch | |
| parent | 15141ab55be96e7255fad4a03fca69cfb2ffd3d7 (diff) | |
| download | meta-openembedded-contrib-c90572b2f6f387f26e1e9e2a92aa1641513679d9.tar.gz | |
glog: updated libunwind look up function
Updated FindLinunwind cmake file to locate libunwind properly in the system.
This includes settings all needed defines in config.h file, which are used
for glog compilation. Changed unwind cmake target to interface, because in
cross-compilation environment we could link against several libunwind shared
libraries.
Signed-off-by: Vyacheslav Yurkov <Vyacheslav.Yurkov@bruker.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch')
| -rw-r--r-- | meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch b/meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch deleted file mode 100644 index 33dc9d38a2..0000000000 --- a/meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur git/CMakeLists.txt ../0.3.5-r0.unwind/git/CMakeLists.txt ---- git/CMakeLists.txt 2018-10-08 08:54:15.118989400 +0200 -+++ ../0.3.5-r0.unwind/git/CMakeLists.txt 2018-10-05 16:26:59.745922318 +0200 -@@ -384,7 +384,9 @@ - set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) - - if (UNWIND_LIBRARY) -- target_link_libraries (glog PUBLIC ${UNWIND_LIBRARY}) -+ add_library(unwind SHARED IMPORTED) -+ set_target_properties(unwind PROPERTIES IMPORTED_LOCATION ${UNWIND_LIBRARY}) -+ target_link_libraries (glog PUBLIC unwind) - endif (UNWIND_LIBRARY) - - if (HAVE_PTHREAD) -diff -ur git/glog-config.cmake.in ../0.3.5-r0.unwind/git/glog-config.cmake.in ---- git/glog-config.cmake.in 2018-10-08 08:54:15.122989699 +0200 -+++ ../0.3.5-r0.unwind/git/glog-config.cmake.in 2018-10-08 08:14:48.550745810 +0200 -@@ -4,4 +4,12 @@ - - @gflags_DEPENDENCY@ - -+find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -+mark_as_advanced (UNWIND_LIBRARY) -+ -+if (UNWIND_LIBRARY) -+ add_library(unwind SHARED IMPORTED) -+ set_target_properties(unwind PROPERTIES IMPORTED_LOCATION ${UNWIND_LIBRARY}) -+endif (UNWIND_LIBRARY) -+ - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") |