From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mail.openembedded.org (Postfix) with ESMTP id CDAFB7948A for ; Mon, 8 Oct 2018 09:18:33 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id r63-v6so7377315wma.4 for ; Mon, 08 Oct 2018 02:18:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k4LriuJqU4E5mMs5mQveBuHJUCtOrswM2xOcScPlWMg=; b=U561LSFPkVl4NwItMmpd+X1d2tGHSxqf4+HXP+JcAhlijg0fkuabDxfyQgrTUK5Rsp aD9nZKD+ceQFgkDrH+ZZ5Id2ieygjEjk5Z9c+DOnY1wztHj0diNDBrxFeUhcayhOyXtA BDA1leaARjD6O+YeRNObVwv3rbsTRD28ezS8dwOhxbWwxEa7ZSGUeNGnF884FtZ72MLy 471sdLbVre5gN/7aBIR863vew0VS+6wXsrr7/qGEqg3kUTkYRrXDB9qdeMu6cbfugEKN /Tx+KY64v3uYhBgo+A4cR3HqbRBSVgFY+NuN4UhUdr6kLeoYyBPQKcgtui9gJflBLHC9 5uQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k4LriuJqU4E5mMs5mQveBuHJUCtOrswM2xOcScPlWMg=; b=Rk7IBOGThUrNtnBkcPFb0vF3qBJw08p1BBby321oS3uynEScnYysS71Z5o8v/mY4k/ wvAGEDU7g0rmmqosNkKRvb+5FhUE3DjSS6VD0IdVsO2dd55I59FFXrIwkSWdvEe/oVMH BQTwBBISkqnYIylisWGZPvVd73E9q05t0q0pYvJSggIId9U5DJ+0tEYKUqEIp3CikbkX KdeJgbUGPxcH3q3zhAIBVzHVHc6nX5+yxJm/WXKz/M94Fz3cSF25xJrrV/XsUUvZFc2s 3bsL/2mt8ILIwiSMDCH0DxZcE6ihwc3HjfvSlMLsz1zHS1AWmlsPd8YXaqlx0npF/B7E WjdQ== X-Gm-Message-State: ABuFfohWATz6TCYTo02rzrozQ5jgLSUx+5tukiWiwmjSu9rKmewfojxf FpDEvANlrhsTrJ1ilN1R8IHv9Rcbs/Q= X-Google-Smtp-Source: ACcGV61PxCo/ZEkigCT1Bc+lSMCTX2wkx5zdcq5KbceSDnQrjkS6mlm9blICFtIo8x4/tnF1Xc6lLw== X-Received: by 2002:a1c:b504:: with SMTP id e4-v6mr7352397wmf.134.1538990314072; Mon, 08 Oct 2018 02:18:34 -0700 (PDT) Received: from localhost.localdomain (ip-109-42-2-227.web.vodafone.de. [109.42.2.227]) by smtp.gmail.com with ESMTPSA id e7-v6sm16119005wra.37.2018.10.08.02.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Oct 2018 02:18:33 -0700 (PDT) From: Vyacheslav Yurkov To: openembedded-devel@lists.openembedded.org Date: Mon, 8 Oct 2018 11:17:49 +0200 Message-Id: <20181008091749.45975-1-uvv.mail@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [meta-oe][PATCH] glog: upgrade 0.3.4 -> 0.3.5 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2018 09:18:34 -0000 Content-Transfer-Encoding: 8bit Upgraded glog recipe to a new stable version in favor of cmake configuration Old configure.ac patch is removed. Another cmake patch is added. When UNWIND_LIBRARY is used directly as a public dependency then absolute path is stored in cmake config file. This is an issue when glog is used as part of generated SDK, which was built on another machine. When SDK is installed on developer's machine, cmake config contains a full path to non-existent location. The solution is to find libunwind during configure stage and store target name as a dependency, not a full path Signed-off-by: Vyacheslav Yurkov --- ...gure.ac-Allow-user-to-disable-gflags.patch | 35 ------------------- ...0001-find-libunwind-during-configure.patch | 30 ++++++++++++++++ .../glog/{glog_0.3.4.bb => glog_0.3.5.bb} | 13 +++---- 3 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch create mode 100644 meta-oe/recipes-support/glog/glog/0001-find-libunwind-during-configure.patch rename meta-oe/recipes-support/glog/{glog_0.3.4.bb => glog_0.3.5.bb} (55%) 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 596281ff6..000000000 --- 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 -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 ---- - 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 000000000..33dc9d38a --- /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 similarity index 55% rename from meta-oe/recipes-support/glog/glog_0.3.4.bb rename to meta-oe/recipes-support/glog/glog_0.3.5.bb index d7c1974c6..bf7df53f3 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})" -- 2.19.0