| Message ID | 1458641641-17752-1-git-send-email-nitin.mendiratta@rockwellcollins.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Nitin, On Tue, Mar 22, 2016 at 03:44:01PM +0530, Nitin Mendiratta wrote: > +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. > +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. > +endif > + > +ifeq ($(BR2_PACKAGE_ICU),y) > +RAPTOR_DEPENDENCIES += icu > +RAPTOR_CONF_OPTS += --with-icu-config=$(STAGING_DIR)/usr/bin/icu-config > +endif baruch
Hello, On Tue, 22 Mar 2016 15:44:01 +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> > Signed-off-by: Nitin Mendiratta <nitin.mendiratta@rockwellcollins.com> Thanks, I've applied, after fixing the comments made by Baruch. > ...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
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..7367ad2 --- /dev/null +++ b/package/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch @@ -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 <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..5dac2c0 --- /dev/null +++ b/package/raptor/raptor.mk @@ -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))