Skip to contentSkip to conversation

gflags: New recipe

PATCH In review Ricardo Ribalda Delgado 4 participants 8 messages Aug 11, 2016 – Aug 12, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 gflags: New recipe

C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used.

Used optionally by glog

---
 meta-oe/recipes-support/gflags/gflags_2.1.2.bb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 meta-oe/recipes-support/gflags/gflags_2.1.2.bb
meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +19 -0
new file mode 100644
index 000000000000..30fd5f85e253
@@ -0,0 +1,19 @@
+DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used"
+HOMEPAGE = "https://github.com/gflags/gflags"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
+
+SRCREV = "1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c"
+SRC_URI = "git://github.com/gflags/gflags.git;branch=release"
+
+S = "${WORKDIR}/git/"
+
+inherit cmake
+
+EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON"
+
+FILES_${PN}-dev += "${libdir}/cmake"
+
+PACKAGES =+ "${PN}-bash-completion"
+FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh"
+RDEPENDS_${PN}-bash-completion = "bash-completion"
Signature · 1 line
2.8.1
#1 lore raw

PATCH v3 2/2 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, 47 insertions(+), 9 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
new file mode 100644
index 000000000000..596281ff6842
@@ -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
deleted file mode 100644
index de3f0765dec9..000000000000
@@ -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 +12 -3
similarity index 49%
rename from meta-oe/recipes-support/glog/glog.inc
rename to meta-oe/recipes-support/glog/glog_0.3.4.bb
index 8a1fb4250bbb..27beef5f9a45 100644
@@ -1,11 +1,20 @@
 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"
 
+SRCREV = "d8cb47f77d1c31779f3ff890e1a5748483778d6a"
+SRC_URI = " \
+    git://github.com/google/glog.git \
+    file://0001-configure.ac-Allow-user-to-disable-gflags.patch \
+"
+
+S = "${WORKDIR}/git"
+
 inherit autotools pkgconfig
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gflags] = ",--without-gflags,gflags,"
Signature · 1 line
2.8.1
Acked-by on v3 1/2
#2 lore raw
In reply to Ricardo Ribalda Delgado
Quoted 27 lines · Ricardo Ribalda Delgado

C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used.

Used optionally by glog

---
  meta-oe/recipes-support/gflags/gflags_2.1.2.bb | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)

create mode 100644 meta-oe/recipes-support/gflags/gflags_2.1.2.bb

meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +9 -0
new file mode 100644
index 000000000000..30fd5f85e253
@@ -0,0 +1,19 @@
+DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used"
+HOMEPAGE = "https://github.com/gflags/gflags"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
+
+SRCREV = "1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c"
+SRC_URI = "git://github.com/gflags/gflags.git;branch=release"
+
+S = "${WORKDIR}/git/"

meta-oe/recipes-support/gflags/gflags_2.1.2.bb line 19

Quoted 10 lines
meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +10 -0
+
+inherit cmake
+
+EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON"
+
+FILES_${PN}-dev += "${libdir}/cmake"
+
+PACKAGES =+ "${PN}-bash-completion"
+FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh"
+RDEPENDS_${PN}-bash-completion = "bash-completion"

Looks good to me.

#3 lore raw
In reply to Ricardo Ribalda Delgado
Quoted 21 lines · Ricardo Ribalda Delgado

C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used.

Used optionally by glog

---
meta-oe/recipes-support/gflags/gflags_2.1.2.bb | 19 +++++++++++++++++++

1 file changed, 19 insertions(+)

create mode 100644 meta-oe/recipes-support/gflags/gflags_2.1.2.bb

meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +0 -0
new file mode 100644
index 000000000000..30fd5f85e253

meta-oe/recipes-support/gflags/gflags_2.1.2.bb line 3

Quoted 3 lines
meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +3 -0
@@ -0,0 +1,19 @@
+DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used"
+HOMEPAGE = "https://github.com/gflags/gflags"
+LICENSE = “BSD"

which Clause ?

Quoted 24 lines
meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +16 -1
+LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
+
+SRCREV = "1a02f2851ee3d48d32d2c8f4d8f390a0bc25565c"
+SRC_URI = "git://github.com/gflags/gflags.git;branch=release"
+
+S = "${WORKDIR}/git/"
+
+inherit cmake
+
+EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON"
+
+FILES_${PN}-dev += "${libdir}/cmake"
+
+PACKAGES =+ "${PN}-bash-completion"
+FILES_${PN}-bash-completion += "${bindir}/gflags_completions.sh"
+RDEPENDS_${PN}-bash-completion = "bash-completion"
--

2.8.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw

Hi Khem

Quoted 5 lines · Khem Raj

meta-oe/recipes-support/gflags/gflags_2.1.2.bb

Quoted 3 lines
meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +3 -0
+DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used"
+HOMEPAGE = "https://github.com/gflags/gflags"
+LICENSE = “BSD"

which Clause ?

I have no idea,
I has the same License file as glog:

https://github.com/gflags/gflags/blob/master/COPYING.txt
https://github.com/google/glog/blob/master/COPYING

That is why I choose BSD.

Regards!

#5 lore raw
Quoted 10 lines · Ricardo Ribalda Delgado

Hi Khem

Quoted 5 lines · Khem Raj

meta-oe/recipes-support/gflags/gflags_2.1.2.bb

Quoted 3 lines
meta-oe/recipes-support/gflags/gflags_2.1.2.bb new file +3 -0
+DESCRIPTION = "The gflags package contains a C++ library that implements commandline flags processing. It includes built-in support for standard types such as string and the ability to define flags in the source file in which they are used"
+HOMEPAGE = "https://github.com/gflags/gflags"
+LICENSE = “BSD"

which Clause ?

Quoted 7 lines

I have no idea,
I has the same License file as glog:

https://github.com/gflags/gflags/blob/master/COPYING.txt
https://github.com/google/glog/blob/master/COPYING

That is why I choose BSD.

So it seems its BSD-3-Clause

Quoted 7 lines

Regards!
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#6 lore raw

Hi Kehm

Quoted 2 lines · Khem Raj

So it seems its BSD-3-Clause

Shall I produce a patch for glog and gflags?

#7 lore raw
Quoted 8 lines · Ricardo Ribalda Delgado

Hi Kehm

Quoted 2 lines · Khem Raj

So it seems its BSD-3-Clause

Shall I produce a patch for glog and gflags?

I'll update it in master-next, you don't need to resend.

Quoted 5 lines
Signature · 4 lines
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]