glog: Update to version 0.3.4
PATCH v2 1/1 glog: Update to version 0.3.4
-The repository has been moved to github.
-There is a new release 0.3.4
-Add a user configurable dependency on gflag
-Merge .inc file on the recipe
---
...configure.ac-Allow-user-to-disable-gflags.patch | 35 ++++++++++++++++++++++
meta-oe/recipes-support/glog/glog_0.3.3.bb | 6 ----
.../glog/{glog.inc => glog_0.3.4.bb} | 15 ++++++++--
3 files changed, 48 insertions(+), 8 deletions(-)
create mode 100644 meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch
delete mode 100644 meta-oe/recipes-support/glog/glog_0.3.3.bb
rename meta-oe/recipes-support/glog/{glog.inc => glog_0.3.4.bb} (49%)meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch new file +35 -0
@@ -0,0 +1,35 @@ +From 0fabde0515e180c53961c27346dd7a79cffa4c1f Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <[email protected]> +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 <[email protected]> +--- + 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 +
meta-oe/recipes-support/glog/glog_0.3.3.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require glog.inc - -SRC_URI = "http://google-glog.googlecode.com/files/glog-${PV}.tar.gz" - -SRC_URI[md5sum] = "a6fd2c22f8996846e34c763422717c18" -SRC_URI[sha256sum] = "fbf90c2285ba0561db7a40f8a4eefb9aa963e7d399bd450363e959929fe849d0"
meta-oe/recipes-support/glog/glog_0.3.4.bb renamed from meta-oe/recipes-support/glog/glog.inc +13 -2
@@ -1,11 +1,22 @@ DESCRIPTION = "The glog library implements application-level logging. This \ library provides logging APIs based on C++-style streams and various helper \ macros." -HOMEPAGE = "https://code.google.com/p/google-glog/" - +HOMEPAGE = "https://github.com/google/glog" LICENSE = "BSD" 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 \ + " + +SRCREV = "d8cb47f77d1c31779f3ff890e1a5748483778d6a" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gflags] = ",--without-gflags,gflags," + inherit autotools pkgconfig
Signature · 1 line
2.8.1
Quoted 81 lines · Ricardo Ribalda Delgado
(quoted diff) +0
-4-The repository has been moved to github. -There is a new release 0.3.4 -Add a user configurable dependency on gflag -Merge .inc file on the recipeSigned-off-by Ricardo Ribalda Delgado <[email protected]>--- ...configure.ac-Allow-user-to-disable-gflags.patch | 35 ++++++++++++++++++++++ meta-oe/recipes-support/glog/glog_0.3.3.bb | 6 ---- .../glog/{glog.inc => glog_0.3.4.bb} | 15 ++++++++-- 3 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch delete mode 100644 meta-oe/recipes-support/glog/glog_0.3.3.bb rename meta-oe/recipes-support/glog/{glog.inc => glog_0.3.4.bb} (49%)meta-oe/recipes-support/glog/glog/0001-configure.ac-Allow-user-to-disable-gflags.patch new file +35
-0@@ -0,0 +1,35 @@ +From 0fabde0515e180c53961c27346dd7a79cffa4c1f Mon Sep 17 00:00:00 2001 +From: Ricardo Ribalda Delgado <[email protected]> +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 <[email protected]> +--- + 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 +meta-oe/recipes-support/glog/glog_0.3.3.bb deleted +0
-6@@ -1,6 +0,0 @@ -require glog.inc - -SRC_URI = "http://google-glog.googlecode.com/files/glog-${PV}.tar.gz" - -SRC_URI[md5sum] = "a6fd2c22f8996846e34c763422717c18" -SRC_URI[sha256sum] = "fbf90c2285ba0561db7a40f8a4eefb9aa963e7d399bd450363e959929fe849d0"meta-oe/recipes-support/glog/glog_0.3.4.bb renamed from meta-oe/recipes-support/glog/glog.inc +0
-2@@ -1,11 +1,22 @@ DESCRIPTION = "The glog library implements application-level logging. This \ library provides logging APIs based on C++-style streams and various helper \ macros." -HOMEPAGE = "https://code.google.com/p/google-glog/" -
meta-oe/recipes-support/glog/glog_0.3.4.bb line 13
Quoted 10 lines
meta-oe/recipes-support/glog/glog_0.3.4.bb renamed from meta-oe/recipes-support/glog/glog.inc +5
-0+HOMEPAGE = "https://github.com/google/glog" LICENSE = "BSD" 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 \ + "
Please see show we normally indent multiline variables (4 spaces, closing quote as first character on separate line.
I'll update this for now, but next time please follow this.
Quoted 17 lines
meta-oe/recipes-support/glog/glog_0.3.4.bb renamed from meta-oe/recipes-support/glog/glog.inc +8
-0+ +SRCREV = "d8cb47f77d1c31779f3ff890e1a5748483778d6a" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gflags] = ",--without-gflags,gflags," + inherit autotools pkgconfigSignature · 7 lines
2.8.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Hi Martin
On Thu, Aug 11, 2016 at 1:46 PM, Martin Jansa <[email protected]> wrote:
+ "
Quoted 5 lines
Please see show we normally indent multiline variables (4 spaces, closing quote as first character on separate line.
I'll update this for now, but next time please follow this.
Do you have a readme with this? Or something like checkpatch from the kernel?
Thanks!
Quoted 11 lines · Ricardo Ribalda Delgado
Hi Martin
On Thu, Aug 11, 2016 at 1:46 PM, Martin Jansa <[email protected]> wrote:
+ "Quoted 5 lines
Please see show we normally indent multiline variables (4 spaces, closing quote as first character on separate line.
I'll update this for now, but next time please follow this.
Do you have a readme with this? Or something like checkpatch from the kernel?
http://www.openembedded.org/wiki/Styleguide
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]