raptor: new package

PATCH New Nitin Mendiratta 3 participants 3 messages Mar 22, 2016 – Mar 26, 2016

lore

Share & tools

lore

Nitin Mendiratta

author

2016-03-22 10:14 UTC #0 lore raw

PATCH v2 1/1 raptor: new package

From: Matt Weber <[email protected]>

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 <[email protected]>

Signed-off-by Nitin Mendiratta <[email protected]>

---
Changes v1 -> v2:
- Updated the comment for the patch file.
- Included flag RAPTOR_AUTORECONF and added RAPTOR_CONF_OPTS for optional dependencies in .mk file.
- Fixed minor typo error.

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

---
 package/Config.in                                  |  1 +
 ...igure.ac-remove-conditional-lib-inclusion.patch | 21 +++++++++++++
 package/raptor/Config.in                           | 11 +++++++
 package/raptor/raptor.hash                         |  2 ++
 package/raptor/raptor.mk                           | 36 ++++++++++++++++++++++
 5 files changed, 71 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

package/Config.in +1 -0

index c4d98c4..430cef8 100644
@@ -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"

package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch new file +21 -0

new file mode 100644
index 0000000..7367ad2
@@ -0,0 +1,21 @@
+Removed header Include path from the configure file as path was
+from the host, which is wrong for the cross compilation.
+Upstream: None
+
+Signed-off-by: Nitin Mendiratta <[email protected]>
+
+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"
+

package/raptor/Config.in new file +11 -0

new file mode 100644
index 0000000..65979a2
@@ -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/

package/raptor/raptor.hash new file +2 -0

new file mode 100644
index 0000000..ee7a71b
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz

package/raptor/raptor.mk new file +36 -0

new file mode 100644
index 0000000..5dac2c0
@@ -0,0 +1,36 @@
+################################################################################
+#
+# 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
+
+# Flag is added to make sure the patch is applied for the configure.ac of raptor.
+RAPTOR_AUTORECONF = YES
+
+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
+RAPTOR_CONF_OPTS += --with-curl-config=$(STAGING_DIR)/usr/bin/curl-config
+endif
+
+ifeq ($(BR2_PACKAGE_YAJL),y)
+RAPTOR_DEPENDENCIES += yajl
+RAPTOR_CONF_ENV += LIBS="-lm"
+RAPTOR_CONF_OPTS += --with-yajl-config=$(STAGING_DIR)/usr/bin/yajl-config
+endif
+
+ifeq ($(BR2_PACKAGE_ICU),y)
+RAPTOR_DEPENDENCIES += icu
+RAPTOR_CONF_OPTS += --with-icu-config=$(STAGING_DIR)/usr/bin/icu-config
+endif
+
+$(eval $(autotools-package))

Signature · 1 line

2.5.0

Baruch Siach

2016-03-22 19:40 UTC #1 lore raw

PATCH v2 1/1 raptor: new package

Hi Nitin,

package/raptor/raptor.mk line 23

Quoted 4 lines · Nitin Mendiratta

package/raptor/raptor.mk new file +4 -0

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

Please add an 'else' clause that disables libcurl using --with-curl-config=no. The same goes for the two other optional dependencies.

package/raptor/raptor.mk line 28

Quoted 4 lines

package/raptor/raptor.mk new file +4 -0

+ifeq ($(BR2_PACKAGE_YAJL),y)
+RAPTOR_DEPENDENCIES += yajl
+RAPTOR_CONF_ENV += LIBS="-lm"
+RAPTOR_CONF_OPTS += --with-yajl-config=$(STAGING_DIR)/usr/bin/yajl-config

The yajl package does not provide yajl-config, and raptor configure does not support --with-yajl-config. Should be

  RAPTOR_CONF_OPTS += --with-yajl=$(STAGING_DIR)/usr/

instead.

package/raptor/raptor.mk line 34

Quoted 6 lines

package/raptor/raptor.mk new file +6 -0

+endif
+
+ifeq ($(BR2_PACKAGE_ICU),y)
+RAPTOR_DEPENDENCIES += icu
+RAPTOR_CONF_OPTS += --with-icu-config=$(STAGING_DIR)/usr/bin/icu-config
+endif

baruch

Signature · 3 lines

     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 -

Thomas Petazzoni

2016-03-26 18:15 UTC #2 lore raw

PATCH v2 1/1 raptor: new package

In reply to Nitin Mendiratta

Hello,

Quoted 6 lines · Nitin Mendiratta

From: Matt Weber <[email protected]>
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.

Quoted 7 lines

http://librdf.org/raptor/
Patch added in the package:
0001-configure.ac-remove-conditional-lib-inclusion.patch
Signed-off-by Matt Weber <[email protected]>
Signed-off-by Nitin Mendiratta <[email protected]>

Thanks, I've applied, after fixing the comments made by Baruch.

Quoted 1 line

 ...igure.ac-remove-conditional-lib-inclusion.patch | 21 +++++++++++++

Also, please contribute this patch to the upstream project. The upstream project is hosted on Github, so it's really trivial to contribute things upstream.

Thanks!

Thomas

Signature · 3 lines

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