diff options
| -rw-r--r-- | meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch | 35 | ||||
| -rw-r--r-- | meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/glog/glog_0.3.5.bb (renamed from meta-oe/recipes-support/glog/glog_0.3.4.bb) | 13 |
3 files changed, 37 insertions, 41 deletions
diff --git a/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch b/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch deleted file mode 100644 index 596281ff68..0000000000 --- a/meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0fabde0515e180c53961c27346dd7a79cffa4c1f Mon Sep 17 00:00:00 2001 -From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> -Date: Thu, 11 Aug 2016 11:49:36 +0200 -Subject: [PATCH] configure.ac: Allow user to disable gflags - -Under some circumstances like cross-compilation, the user might not want -to enable support for gflags. - -This patch allows support for --without-gflags - -Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7b4d21e7ae8a..eba5e5cda1ea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -136,7 +136,11 @@ AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR], - CFLAGS="$CFLAGS $GFLAGS_CFLAGS" - LIBS="$LIBS $GFLAGS_LIBS" - ) --AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) -+if test x"$with_gflags" = x"no"; then -+ ac_cv_have_libgflags=0 -+else -+ AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) -+fi - if test x"$ac_cv_have_libgflags" = x"1"; then - AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library]) - if test x"$GFLAGS_LIBS" = x""; then --- -2.8.1 - 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 new file mode 100644 index 0000000000..33dc9d38a2 --- /dev/null +++ b/meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch @@ -0,0 +1,30 @@ +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") diff --git a/meta-oe/recipes-support/glog/glog_0.3.4.bb b/meta-oe/recipes-support/glog/glog_0.3.5.bb index d7c1974c68..bf7df53f3f 100644 --- a/meta-oe/recipes-support/glog/glog_0.3.4.bb +++ b/meta-oe/recipes-support/glog/glog_0.3.5.bb @@ -9,15 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" DEPENDS = "libunwind" SRC_URI = " \ - git://github.com/google/glog.git \ - file://0001-configure.ac-Allow-user-to-disable-gflags.patch \ + git://github.com/google/glog.git;branch=v035 \ + file://0001-find-libunwind-during-configure.patch \ " -SRCREV = "d8cb47f77d1c31779f3ff890e1a5748483778d6a" +SRCREV = "a6a166db069520dbbd653c97c2e5b12e08a8bb26" S = "${WORKDIR}/git" -PACKAGECONFIG ??= "" -PACKAGECONFIG[gflags] = ",--without-gflags,gflags," +inherit cmake -inherit autotools pkgconfig +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dev = "${PN}-staticdev" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" |