glog: fixed the build for mips and other platforms
PATCH 1/2 glog: fixed the build for mips and other platforms
From: Vyacheslav Yurkov <[email protected]>
According to build log http://errors.yoctoproject.org/Errors/Details/201286/
FindLibunwind wokred only for x86, arm, and x86_64. This patch extends the cmake module to work with mips, ia64, ppc(64) and other architectures supported by libunwind
Signed-off-by Vyacheslav Yurkov <[email protected]>
Signed-off-by Khem Raj <[email protected]>
--- ...0002-Find-Libunwind-during-configure.patch | 53 +++++++++++-------- 1 file changed, 30 insertions(+), 23 deletions(-)
meta-oe/recipes-support/glog/glog/0002-Find-Libunwind-during-configure.patch +30 -23
@@ -1,11 +1,11 @@ diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake --- a/cmake/FindLibunwind.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ b/cmake/FindLibunwind.cmake 2018-11-02 14:04:35.460437058 +0100 -@@ -0,0 +1,37 @@ ++++ b/cmake/FindLibunwind.cmake 2018-11-20 15:53:48.799078114 +0100 +@@ -0,0 +1,54 @@ +# - Try to find libunwind +# Once done this will define +# -+# LIBUNWIND_FOUND - system has libunwind ++# Libunwind_FOUND - system has libunwind +# unwind - cmake target for libunwind + +find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library")
@@ -15,11 +15,24 @@ diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake + +if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") + set(LIBUNWIND_ARCH "arm") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") ++ set(LIBUNWIND_ARCH "aarch64") +elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") ++ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR ++ CMAKE_SYSTEM_PROCESSOR STREQUAL "corei7-64") + set(LIBUNWIND_ARCH "x86_64") +elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") + set(LIBUNWIND_ARCH "x86") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64") ++ set(LIBUNWIND_ARCH "ppc64") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") ++ set(LIBUNWIND_ARCH "ppc32") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") ++ set(LIBUNWIND_ARCH "mips") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") ++ set(LIBUNWIND_ARCH "hppa") ++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ia64") ++ set(LIBUNWIND_ARCH "ia64") +endif() + +find_library (UNWIND_LIBRARY_PLATFORM NAMES "unwind-${LIBUNWIND_ARCH}" DOC "unwind library platform")
@@ -35,13 +48,17 @@ diff -uNr a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake + +mark_as_advanced (UNWIND_LIBRARY UNWIND_LIBRARY_PLATFORM) + -+add_library(unwind INTERFACE IMPORTED) -+set_target_properties(unwind PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" -+) ++if (Libunwind_FOUND) ++ add_library(unwind INTERFACE IMPORTED) ++ set_target_properties(unwind PROPERTIES ++ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" ++ ) ++else() ++ message("Can't find libunwind library") ++endif() diff -uNr a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2018-11-02 14:02:21.784835854 +0100 -+++ b/CMakeLists.txt 2018-11-02 14:03:16.796935594 +0100 +--- a/CMakeLists.txt 2018-11-20 15:49:07.576278417 +0100 ++++ b/CMakeLists.txt 2018-11-20 15:49:32.106819928 +0100 @@ -58,7 +58,6 @@ check_include_file (execinfo.h HAVE_EXECINFO_H) check_include_file (glob.h HAVE_GLOB_H)
@@ -91,23 +108,13 @@ diff -uNr a/CMakeLists.txt b/CMakeLists.txt DESTINATION lib/cmake/glog) install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) -Binary files a/.git/index and b/.git/index differ diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in ---- a/glog-config.cmake.in 2018-11-02 14:02:21.784835854 +0100 -+++ b/glog-config.cmake.in 2018-11-02 14:03:16.796935594 +0100 -@@ -4,4 +4,15 @@ +--- a/glog-config.cmake.in 2018-11-20 15:49:07.576278417 +0100 ++++ b/glog-config.cmake.in 2018-11-20 15:52:32.330418489 +0100 +@@ -4,4 +4,6 @@ @gflags_DEPENDENCY@ -+# Record the state of the CMake module path when this script was -+# called so that we can ensure that we leave it in the same state on -+# exit as it was on entry, but modify it locally. -+set(UNWIND_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) -+ -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") +find_dependency (Libunwind) -+ -+# Restore original module path -+set(CMAKE_MODULE_PATH "${UNWIND_CMAKE_MODULE_PATH}") + include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake")
Signature · 1 line
2.17.1
PATCH 2/2 glog: fix installation path
From: Vyacheslav Yurkov <[email protected]>
When glog is compiled with multilib support, it shouldn't use hardcoded paths. Paths substitued by CMake should be used instead.
Signed-off-by Vyacheslav Yurkov <[email protected]>
Tested-by Martin Jansa <[email protected]>
Signed-off-by Khem Raj <[email protected]>
--- .../glog/0003-installation-path-fix.patch | 65 +++++++++++++++++++ meta-oe/recipes-support/glog/glog_0.3.5.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch
meta-oe/recipes-support/glog/glog/0003-installation-path-fix.patch new file +65 -0
@@ -0,0 +1,65 @@ +diff -uNr a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2018-12-05 12:55:59.630792054 +0100 ++++ b/CMakeLists.txt 2018-12-05 13:00:22.922269200 +0100 +@@ -403,10 +403,15 @@ + + set_target_properties (glog PROPERTIES PUBLIC_HEADER "${GLOG_PUBLIC_H}") + ++set (_glog_CMake_BINDIR ${CMAKE_INSTALL_BINDIR}) ++set (_glog_CMake_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}) ++set (_glog_CMake_LIBDIR ${CMAKE_INSTALL_LIBDIR}) ++set (_glog_CMake_INSTALLDIR ${_glog_CMake_LIBDIR}/cmake/glog) ++ + target_include_directories (glog BEFORE PUBLIC + "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" + "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>" +- "$<INSTALL_INTERFACE:include>" ++ "$<INSTALL_INTERFACE:${_glog_CMake_INCLUDE_DIR}>" + PRIVATE ${CMAKE_CURRENT_BINARY_DIR} + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) + +@@ -543,10 +548,10 @@ + + install (TARGETS glog + EXPORT glog-targets +- RUNTIME DESTINATION bin +- PUBLIC_HEADER DESTINATION include/glog +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++ RUNTIME DESTINATION ${_glog_CMake_BINDIR} ++ PUBLIC_HEADER DESTINATION ${_glog_CMake_INCLUDE_DIR}/glog ++ LIBRARY DESTINATION ${_glog_CMake_LIBDIR} ++ ARCHIVE DESTINATION ${_glog_CMake_LIBDIR}) + + if (gflags_FOUND) + set (gflags_DEPENDENCY "find_dependency (gflags ${gflags_VERSION})") +@@ -554,7 +559,7 @@ + + configure_package_config_file (glog-config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake +- INSTALL_DESTINATION lib/cmake/glog ++ INSTALL_DESTINATION ${_glog_CMake_INSTALLDIR} + NO_CHECK_REQUIRED_COMPONENTS_MACRO) + + write_basic_package_version_file (glog-config-version.cmake VERSION +@@ -567,6 +572,7 @@ + ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake +- DESTINATION lib/cmake/glog) ++ DESTINATION ${_glog_CMake_INSTALLDIR}) + +-install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) ++install (EXPORT glog-targets NAMESPACE glog:: DESTINATION ++ ${_glog_CMake_INSTALLDIR}) +diff -uNr a/glog-config.cmake.in b/glog-config.cmake.in +--- a/glog-config.cmake.in 2018-12-05 12:55:59.630792054 +0100 ++++ b/glog-config.cmake.in 2018-12-05 13:05:19.547196843 +0100 +@@ -4,6 +4,7 @@ + + @gflags_DEPENDENCY@ + ++list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") + find_dependency (Libunwind) + + include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake")
meta-oe/recipes-support/glog/glog_0.3.5.bb +1 -0
@@ -12,6 +12,7 @@ SRC_URI = " \ git://github.com/google/glog.git;branch=v035 \ file://0001-Rework-CMake-glog-VERSION-management.patch \ file://0002-Find-Libunwind-during-configure.patch \ + file://0003-installation-path-fix.patch \ " SRCREV = "a6a166db069520dbbd653c97c2e5b12e08a8bb26"
Signature · 1 line
2.17.1