[Buildroot] [PATCH 1/1] raptor: new package

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/1] raptor: new package
@ 2016-02-23  4:07 Matt Weber
  2016-03-06 21:19 ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Matt Weber @ 2016-02-23  4:07 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
---
 package/Config.in          |  1 +
 package/raptor/Config.in   | 13 +++++++++++++
 package/raptor/raptor.hash |  2 ++
 package/raptor/raptor.mk   | 19 +++++++++++++++++++
 4 files changed, 35 insertions(+)
 create mode 100644 package/raptor/Config.in
 create mode 100644 package/raptor/raptor.hash
 create mode 100644 package/raptor/raptor.mk

diff --git a/package/Config.in b/package/Config.in
index 529ad33..3f0b442 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1008,6 +1008,7 @@ menu "JSON/XML"
 	source "package/mxml/Config.in"
 	source "package/rapidjson/Config.in"
 	source "package/rapidxml/Config.in"
+	source "package/raptor/Config.in"
 	source "package/tinyxml/Config.in"
 	source "package/tinyxml2/Config.in"
 	source "package/xerces/Config.in"
diff --git a/package/raptor/Config.in b/package/raptor/Config.in
new file mode 100644
index 0000000..61bc49b
--- /dev/null
+++ b/package/raptor/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_RAPTOR
+	bool "raptor"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBXSLT
+	select BR2_PACKAGE_YAJL
+	help
+	  A C library that provides a set of parsers and
+	  serializers that generate Resource Description
+	  Framework (RDF) triples by parsing syntaxes or
+	  serialize the triples into a syntax.
+
+	  http://librdf.org/raptor/
diff --git a/package/raptor/raptor.hash b/package/raptor/raptor.hash
new file mode 100644
index 0000000..ee7a71b
--- /dev/null
+++ b/package/raptor/raptor.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz
diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk
new file mode 100644
index 0000000..128e444
--- /dev/null
+++ b/package/raptor/raptor.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# raptor
+#
+################################################################################
+
+RAPTOR_VERSION = 2.0.15
+RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
+RAPTOR_SITE = http://download.librdf.org/source
+RAPTOR_DEPENDENCIES = libxml2 libcurl libxslt yajl
+RAPTOR_LICENSE = GPLv2.1 LGPLv2.1 Apache-2.0
+RAPTOR_LICENSE_FILES = LICENSE.txt
+
+RAPTOR_CONF_OPTS = --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \
+		--with-curl-config=$(STAGING_DIR)/usr/bin/curl-config \
+		--with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \
+		--with-yajl=$(STAGING_DIR)
+
+$(eval $(autotools-package))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/1] raptor: new package
  2016-02-23  4:07 Matt Weber
@ 2016-03-06 21:19 ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2016-03-06 21:19 UTC (permalink / raw)
  To: buildroot

Matt,

Thanks for this contribution. However, after review/testing, I have a
number of comments, see below.

On Mon, 22 Feb 2016 22:07:37 -0600, Matt Weber wrote:

> diff --git a/package/raptor/Config.in b/package/raptor/Config.in
> new file mode 100644
> index 0000000..61bc49b
> --- /dev/null
> +++ b/package/raptor/Config.in
> @@ -0,0 +1,13 @@
> +config BR2_PACKAGE_RAPTOR
> +	bool "raptor"
> +	select BR2_PACKAGE_LIBXML2
> +	select BR2_PACKAGE_LIBCURL

libcurl is not a mandatory dependency.

> +	select BR2_PACKAGE_LIBXSLT
> +	select BR2_PACKAGE_YAJL

neither is yajl.

> +RAPTOR_VERSION = 2.0.15
> +RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
> +RAPTOR_SITE = http://download.librdf.org/source
> +RAPTOR_DEPENDENCIES = libxml2 libcurl libxslt yajl

See above. Only libxml2 and libxslt are mandatory. libcurl and yajl are
optional. In addition, with your package, the detection of yajl doesn't
work with the following configuration to due a missing -lm
flag at link time:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2015.11-rc1-71-g90d1299.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_3=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_RAPTOR=y
# BR2_TARGET_ROOTFS_TAR is not set

Note that the package doesn't fail to build (because yajl is not a
mandatory dependency), but yajl is not used.

> +RAPTOR_LICENSE = GPLv2.1 LGPLv2.1 Apache-2.0

This is not correct. First GPLv2.1 doesn't exist. Second, you are
missing an "or" between those license. And finally, they have used the
"or later" for all licenses. This is all written in the LICENSE.txt
file you reference below. So a correct license information would
probably look like:

RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+

It is also worth nothing that there are some scary things in the
configure.in script, such as:

if test -d /usr/include/inn; then
  CPPFLAGS="$CPPFLAGS -I/usr/include/inn"
fi

So, if /usr/include/inn exists on your build machine, it will conclude
that libinn is available.

The configure script also detects the availability of icu, so you
probably want to add an optional dependency on it.

Could you rework your patch to take those comments into account?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/1] raptor: new package
@ 2016-03-17 11:29 Nitin Mendiratta
  2016-03-17 11:58 ` Baruch Siach
  0 siblings, 1 reply; 4+ messages in thread
From: Nitin Mendiratta @ 2016-03-17 11:29 UTC (permalink / raw)
  To: buildroot

From: Matt Weber <matthew.weber@rockwellcollins.com>

Raptor is a free software / Open Source C library that provides a set of parsers
and serializers that generate Resource Description Framework (RDF) triples
by parsing syntaxes or serialize the triples into a syntax.

http://librdf.org/raptor/

Patch added in the package:
0001-configure.ac-remove-conditional-lib-inclusion.patch

Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>

---
Changes v1:
  - Added 0001-configure.ac-remove-conditional-lib-inclusion.patch.
  - Added optional dependencies libcurl,yajl and icu.

Signed-off-by: Nitin Mendiratta <nitin.mendiratta@rockwellcollins.com>
---
 package/Config.in                                  |  1 +
 ...igure.ac-remove-conditional-lib-inclusion.patch | 20 +++++++++++++++
 package/raptor/Config.in                           | 11 ++++++++
 package/raptor/raptor.hash                         |  2 ++
 package/raptor/raptor.mk                           | 30 ++++++++++++++++++++++
 5 files changed, 64 insertions(+)
 create mode 100644 package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
 create mode 100644 package/raptor/Config.in
 create mode 100644 package/raptor/raptor.hash
 create mode 100644 package/raptor/raptor.mk

diff --git a/package/Config.in b/package/Config.in
index c4d98c4..430cef8 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1036,6 +1036,7 @@ menu "JSON/XML"
 	source "package/mxml/Config.in"
 	source "package/rapidjson/Config.in"
 	source "package/rapidxml/Config.in"
+	source "package/raptor/Config.in"
 	source "package/tinyxml/Config.in"
 	source "package/tinyxml2/Config.in"
 	source "package/xerces/Config.in"
diff --git a/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch b/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
new file mode 100644
index 0000000..0fd0495
--- /dev/null
+++ b/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
@@ -0,0 +1,20 @@
+Removed condition for header path inclusion from the configure file.
+Upstream: None
+
+Signed-off-by: Nitin Mendiratta <nitin.mendiratta@rockwellcollins.com>
+
+diff --git a/configure.ac b/configure.ac
+index 10ff870..27b9957 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1145,9 +1145,7 @@ have_lininn=no
+ have_inn_parsedate=no
+ 
+ oCPPFLAGS="$CPPFLAGS"
+-if test -d /usr/include/inn; then
+-  CPPFLAGS="$CPPFLAGS -I/usr/include/inn"
+-fi
++
+ AC_CHECK_HEADER(libinn.h)
+ CPPFLAGS="$oCPPFLAGS"
+ 
diff --git a/package/raptor/Config.in b/package/raptor/Config.in
new file mode 100644
index 0000000..65979a2
--- /dev/null
+++ b/package/raptor/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_RAPTOR
+	bool "raptor"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBXSLT
+	help
+	  A C library that provides a set of parsers and
+	  serializers that generate Resource Description
+	  Framework (RDF) triples by parsing syntaxes or
+	  serialize the triples into a syntax.
+
+	  http://librdf.org/raptor/
diff --git a/package/raptor/raptor.hash b/package/raptor/raptor.hash
new file mode 100644
index 0000000..ee7a71b
--- /dev/null
+++ b/package/raptor/raptor.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz
diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk
new file mode 100644
index 0000000..965ef0c
--- /dev/null
+++ b/package/raptor/raptor.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# raptor
+#
+################################################################################
+
+RAPTOR_VERSION = 2.0.15
+RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
+RAPTOR_SITE = http://download.librdf.org/source
+RAPTOR_DEPENDENCIES = libxml2 libxslt
+RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+
+RAPTOR_LICENSE_FILES = LICENSE.txt
+
+RAPTOR_CONF_OPTS = --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \
+		--with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+RAPTOR_DEPENDENCIES += libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_YAJL),y)
+RAPTOR_DEPENDENCIES += yajl
+RAPTOR_CONF_ENV += LIBS="-lm"
+endif
+
+ifeq ($(BR2_PACKAGE_YAJL),y)
+RAPTOR_DEPENDENCIES += icu
+endif
+
+$(eval $(autotools-package))
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [Buildroot] [PATCH 1/1] raptor: new package
  2016-03-17 11:29 [Buildroot] [PATCH 1/1] raptor: new package Nitin Mendiratta
@ 2016-03-17 11:58 ` Baruch Siach
  0 siblings, 0 replies; 4+ messages in thread
From: Baruch Siach @ 2016-03-17 11:58 UTC (permalink / raw)
  To: buildroot

Hi Nitin,

On Thu, Mar 17, 2016 at 04:59:21PM +0530, Nitin Mendiratta wrote:
> From: Matt Weber <matthew.weber@rockwellcollins.com>
> 
> Raptor is a free software / Open Source C library that provides a set of parsers
> and serializers that generate Resource Description Framework (RDF) triples
> by parsing syntaxes or serialize the triples into a syntax.
> 
> http://librdf.org/raptor/
> 
> Patch added in the package:
> 0001-configure.ac-remove-conditional-lib-inclusion.patch
> 
> Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
> 
> ---
> Changes v1:
>   - Added 0001-configure.ac-remove-conditional-lib-inclusion.patch.
>   - Added optional dependencies libcurl,yajl and icu.
> 
> Signed-off-by: Nitin Mendiratta <nitin.mendiratta@rockwellcollins.com>

Your sign-off should be above the --- separator just below Matt's. Otherwise 
it won't appear in the commit log when this patch applies using 'git am'.

> ---
>  package/Config.in                                  |  1 +
>  ...igure.ac-remove-conditional-lib-inclusion.patch | 20 +++++++++++++++
>  package/raptor/Config.in                           | 11 ++++++++
>  package/raptor/raptor.hash                         |  2 ++
>  package/raptor/raptor.mk                           | 30 ++++++++++++++++++++++
>  5 files changed, 64 insertions(+)
>  create mode 100644 package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
>  create mode 100644 package/raptor/Config.in
>  create mode 100644 package/raptor/raptor.hash
>  create mode 100644 package/raptor/raptor.mk
> 
> diff --git a/package/Config.in b/package/Config.in
> index c4d98c4..430cef8 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1036,6 +1036,7 @@ menu "JSON/XML"
>  	source "package/mxml/Config.in"
>  	source "package/rapidjson/Config.in"
>  	source "package/rapidxml/Config.in"
> +	source "package/raptor/Config.in"
>  	source "package/tinyxml/Config.in"
>  	source "package/tinyxml2/Config.in"
>  	source "package/xerces/Config.in"
> diff --git a/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch b/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
> new file mode 100644
> index 0000000..0fd0495
> --- /dev/null
> +++ b/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch
> @@ -0,0 +1,20 @@
> +Removed condition for header path inclusion from the configure file.

You should mention here that this include path is from the host, which is 
wrong for cross compilation.

[snip]

> diff --git a/package/raptor/raptor.mk b/package/raptor/raptor.mk
> new file mode 100644
> index 0000000..965ef0c
> --- /dev/null
> +++ b/package/raptor/raptor.mk
> @@ -0,0 +1,30 @@
> +################################################################################
> +#
> +# raptor
> +#
> +################################################################################
> +
> +RAPTOR_VERSION = 2.0.15
> +RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
> +RAPTOR_SITE = http://download.librdf.org/source
> +RAPTOR_DEPENDENCIES = libxml2 libxslt
> +RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+
> +RAPTOR_LICENSE_FILES = LICENSE.txt

Since you patch configure.ac, you need 'RAPTOR_AUTORECONF = YES' here. Also, 
please add a comment explaining that we need this because we are patching 
configure.ac.

> +
> +RAPTOR_CONF_OPTS = --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \
> +		--with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config
> +
> +ifeq ($(BR2_PACKAGE_LIBCURL),y)
> +RAPTOR_DEPENDENCIES += libcurl
> +endif

If the configure scripts uses --with-libcurl/--without-libcurl please add this 
options to RAPTOR_CONF_OPTS as appropriate. The same goes for the rest of the 
optional dependencies below.

> +
> +ifeq ($(BR2_PACKAGE_YAJL),y)
> +RAPTOR_DEPENDENCIES += yajl
> +RAPTOR_CONF_ENV += LIBS="-lm"
> +endif
> +
> +ifeq ($(BR2_PACKAGE_YAJL),y)

Typo.

> +RAPTOR_DEPENDENCIES += icu
> +endif
> +
> +$(eval $(autotools-package))

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-03-17 11:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-17 11:29 [Buildroot] [PATCH 1/1] raptor: new package Nitin Mendiratta
2016-03-17 11:58 ` Baruch Siach
  -- strict thread matches above, loose matches on Subject: below --
2016-02-23  4:07 Matt Weber
2016-03-06 21:19 ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox