[Buildroot] [PATCH 1/2] Add libjson-glib to packages

[Buildroot] [PATCH 1/2] Add libjson-glib to packages

[Elias Woods]

---
 package/libjson-glib/Config.in       |    8 ++++++++
 package/libjson-glib/libjson-glib.mk |   31 +++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 package/libjson-glib/Config.in
 create mode 100644 package/libjson-glib/libjson-glib.mk

diff --git a/package/libjson-glib/Config.in b/package/libjson-glib/Config.in
new file mode 100644
index 0000000..c3ee871
--- /dev/null
+++ b/package/libjson-glib/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBJSONGLIB
+	bool "libjson-glib"
+	depends on BR2_PACKAGE_LIBGLIB2 # glib2
+	help
+	Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects.
+
+comment "libjson-glib requires libglib2 to be installed"
+	depends on !BR2_PACKAGE_LIBGLIB2
diff --git a/package/libjson-glib/libjson-glib.mk b/package/libjson-glib/libjson-glib.mk
new file mode 100644
index 0000000..24e1755
--- /dev/null
+++ b/package/libjson-glib/libjson-glib.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# libjson-glib
+#
+#############################################################
+LIBJSONGLIB_VERSION_MAJOR = 0
+LIBJSONGLIB_VERSION_MINOR = 12
+LIBJSONGLIB_VERSION_MICRO = 2
+LIBJSONGLIB_VERSION = $(LIBJSONGLIB_VERSION_MAJOR).$(LIBJSONGLIB_VERSION_MINOR).$(LIBJSONGLIB_VERSION_MICRO)
+LIBJSONGLIB_SOURCE = json-glib-$(LIBJSONGLIB_VERSION).tar.bz2
+
+LIBJSONGLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(LIBJSONGLIB_VERSION_MAJOR).$(LIBJSONGLIB_VERSION_MINOR)
+
+LIBJSONGLIB_LIBTOOL_PATCH = NO
+LIBJSONGLIB_INSTALL_STAGING = YES
+LIBJSONGLIB_INSTALL_TARGET = YES
+#LIBJSONGLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+
+
+LIBJSONGLIB_CONF_OPT = --enable-shared \
+		--enable-static
+
+HOST_LIBJSONGLIB_CONF_OPT = \
+		--enable-shared \
+		--disable-static \
+		--disable-gtk-doc \
+		--enable-debug=no \
+
+LIBJSONGLIB_DEPENDENCIES = libglib2 host-pkg-config
+
+$(eval $(call AUTOTARGETS,package,LIBJSONGLIB))
-- 
1.7.1

[Buildroot] [PATCH 2/2] Add libjson-glib to make menu

[Elias Woods]

---
 package/Config.in |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/package/Config.in b/package/Config.in
index 48f245c..0f21fb6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -328,6 +328,11 @@ source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
 source "package/libglib2/Config.in"
+if BR2_PACKAGE_LIBGLIB2
+menu "glib addons"
+source "package/libjson-glib/Config.in"
+endmenu
+endif
 source "package/liboil/Config.in"
 source "package/libsigc/Config.in"
 source "package/startup-notification/Config.in"
-- 
1.7.1

[Buildroot] [PATCH 2/2] Add libjson-glib to make menu

[Thomas Petazzoni]

Hello,

This should be part of the patch that also introduces libjson-glib.

On Mon, 17 Jan 2011 02:17:25 -0500
Elias Woods <eliaswoods@gmail.com> wrote:

> diff --git a/package/Config.in b/package/Config.in
> index 48f245c..0f21fb6 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -328,6 +328,11 @@ source "package/libdaemon/Config.in"
>  source "package/libelf/Config.in"
>  source "package/libevent/Config.in"
>  source "package/libglib2/Config.in"
> +if BR2_PACKAGE_LIBGLIB2
> +menu "glib addons"
> +source "package/libjson-glib/Config.in"
> +endmenu
> +endif
>  source "package/liboil/Config.in"
>  source "package/libsigc/Config.in"
>  source "package/startup-notification/Config.in"

-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH 1/2] Add libjson-glib to packages

[Thomas Petazzoni]

Hello,

On Mon, 17 Jan 2011 02:17:24 -0500
Elias Woods <eliaswoods@gmail.com> wrote:

> +config BR2_PACKAGE_LIBJSONGLIB
> +	bool "libjson-glib"
> +	depends on BR2_PACKAGE_LIBGLIB2 # glib2

We usually prefer "select" dependencies for library dependencies, but
in that case, it's true that the library is very libglib2-specific, so
we may decide otherwise. I'll let Peter decide on this, I don't have a
strong opinion.

> +	help
> +	Many high-level languages already provide native modules for parsing, generating and manipulating JSON data streams. JSON-GLib is a C library based on GLib and released under the terms of the GNU Lesser General Public License version 2.1. It provides a parser and a generator GObject classes and various wrappers for the complex data types employed by JSON, such as arrays and objects.

Needs to be wrapped at ~80 columns. And the indentation level for the
help text is one tab + 2 spaces.

> --- /dev/null
> +++ b/package/libjson-glib/libjson-glib.mk
> @@ -0,0 +1,31 @@
> +#############################################################
> +#
> +# libjson-glib
> +#
> +#############################################################
> +LIBJSONGLIB_VERSION_MAJOR = 0
> +LIBJSONGLIB_VERSION_MINOR = 12
> +LIBJSONGLIB_VERSION_MICRO = 2

Very minor nitpick: maybe there could be only two variables: one with
0.12 and the other with 2 ?

LIBJSONGLIB_VERSION_MAJOR = 0.12
LIBJSONGLIB_VERSION_MINOR = 2

Like this is done in package/libglib2/libglib2.mk or
package/libgtk2/libgtk2.mk.

> +LIBJSONGLIB_LIBTOOL_PATCH = NO

Why ?

> +LIBJSONGLIB_INSTALL_STAGING = YES
> +LIBJSONGLIB_INSTALL_TARGET = YES
> +#LIBJSONGLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install

If it's commented, it's useless, so remove.

> +$(eval $(call AUTOTARGETS,package,LIBJSONGLIB))

LIBJSONGLIB should be lowercase here.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com