[Buildroot] [PATCHv2 1/1] package/pugixml: add support for a limited set of configuration options

[Buildroot] [PATCHv2 1/1] package/pugixml: add support for a limited set of configuration options

[Thomas De Schampheleire]

From: Wouter Vermeiren <wouter.vermeiren@nokia.com>

Signed-off-by: Wouter Vermeiren <wouter.vermeiren@nokia.com>
[ThomasDS: align with Buildroot coding style; rename some options]
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
 package/pugixml/Config.in  | 71 ++++++++++++++++++++++++++++++++++++++
 package/pugixml/pugixml.mk | 26 ++++++++++++++
 2 files changed, 97 insertions(+)

v2: (feedback Thomas Petazzoni)
- change 'disable' options into 'enable' and reorder them to be first
- rename 'has-long-long' option

diff --git a/package/pugixml/Config.in b/package/pugixml/Config.in
index c37b1df9e5..65ff2a7b4d 100644
--- a/package/pugixml/Config.in
+++ b/package/pugixml/Config.in
@@ -18,5 +18,76 @@ config BR2_PACKAGE_PUGIXML
 	  http://pugixml.org/
 	  https://github.com/zeux/pugixml
 
+if BR2_PACKAGE_PUGIXML
+
+config BR2_PACKAGE_PUGIXML_XPATH_SUPPORT
+	bool "Enable XPath support"
+	default y
+	help
+	  Enables XPath support in pugixml.
+	  When disabled, both XPath interfaces and XPath implementation
+	  are excluded from compilation. This option is provided in case
+	  you do not need XPath functionality and need to save code
+	  space.
+
+config BR2_PACKAGE_PUGIXML_STL_SUPPORT
+	bool "Enable STL support"
+	default y
+	help
+	  Enables use of STL in pugixml.
+	  When disabled, the functions that operate on STL types are no
+	  longer present (i.e. load/save via iostream). This option is
+	  provided in case your target platform does not have a
+	  standard-compliant STL implementation.
+
+config BR2_PACKAGE_PUGIXML_EXCEPTIONS
+	bool "Enable exceptions"
+	default y
+	help
+	  Enables use of exceptions in pugixml. This option is provided
+	  in case your target platform does not have exception handling
+	  capabilities.
+
+config BR2_PACKAGE_PUGIXML_WCHAR_MODE
+	bool "Enable wchar_t mode"
+	help
+	  Toggles between UTF-8 (default) style interface (the in-memory
+	  text encoding is assumed to be UTF-8, most functions use char
+	  as character type) and UTF-16/32 style interface (the
+	  in-memory text encoding is assumed to be UTF-16/32, depending
+	  on wchar_t size, most functions use wchar_t as character type)
+
+	  http://pugixml.org/docs/manual.html#dom.unicode
+
+config BR2_PACKAGE_PUGIXML_COMPACT
+	bool "Enable compact mode"
+	help
+	  Activates a different internal representation of document
+	  storage that is much more memory efficient for documents with
+	  a lot of markup (i.e.  nodes and attributes), but is slightly
+	  slower to parse and access.
+
+	  http://pugixml.org/docs/manual.html#dom.memory.compact
+
+config BR2_PACKAGE_PUGIXML_HEADER_ONLY
+	bool "Enable header-only version"
+	help
+	  All source code for pugixml will be included in every
+	  translation unit that includes pugixml.hpp. This is how most
+	  of Boost and STL libraries work.
+
+	  http://pugixml.org/docs/manual.html#install.building.header
+
+config BR2_PACKAGE_PUGIXML_FORCE_ENABLE_LONG_LONG
+	bool "Force-enable long long support"
+	help
+	  Force-enables support for long long type in pugixml.  Long
+	  long support is automatically enabled if your platform is
+	  known to have long long support (i.e. has C++11 support or
+	  uses a reasonably modern version of a known compiler). If
+	  pugixml does not recognize that your platform supports long
+	  long but in fact it does, you can enable the define manually.
+endif
+
 comment "pugixml needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk
index e5188e5f53..7a35959409 100644
--- a/package/pugixml/pugixml.mk
+++ b/package/pugixml/pugixml.mk
@@ -10,4 +10,30 @@ PUGIXML_LICENSE = MIT
 PUGIXML_LICENSE_FILES = readme.txt
 PUGIXML_INSTALL_STAGING = YES
 
+ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_STL_SUPPORT),)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_STL
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_EXCEPTIONS),)
+PUGIXML_BUILD_DEFINES += PUGIXML_NO_EXCEPTIONS
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_WCHAR_MODE),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_WCHAR_MODE
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_COMPACT),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_COMPACT
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_HEADER_ONLY),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_HEADER_ONLY
+endif
+ifeq ($(BR2_PACKAGE_PUGIXML_FORCE_ENABLE_LONG_LONG),y)
+PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
+endif
+
+ifneq (,$(PUGIXML_BUILD_DEFINES))
+PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(strip $(PUGIXML_BUILD_DEFINES)))"
+endif
+
 $(eval $(cmake-package))
-- 
2.19.2

[Buildroot] [PATCHv2 1/1] package/pugixml: add support for a limited set of configuration options

[Arnout Vandecappelle]

On 31/01/2019 08:40, Thomas De Schampheleire wrote:
> +config BR2_PACKAGE_PUGIXML_FORCE_ENABLE_LONG_LONG
> +	bool "Force-enable long long support"
> +	help
> +	  Force-enables support for long long type in pugixml.  Long
> +	  long support is automatically enabled if your platform is
> +	  known to have long long support (i.e. has C++11 support or
> +	  uses a reasonably modern version of a known compiler). If
> +	  pugixml does not recognize that your platform supports long
> +	  long but in fact it does, you can enable the define manually.
> +endif

 AFAIK gcc always supports long long, so shouldn't we just always enable this?

 Regards,
 Arnout

[Buildroot] [PATCHv2 1/1] package/pugixml: add support for a limited set of configuration options

[Thomas De Schampheleire]

On Sat, Feb 2, 2019, 14:37 Arnout Vandecappelle <arnout@mind.be wrote:

>
>
> On 31/01/2019 08:40, Thomas De Schampheleire wrote:
> > +config BR2_PACKAGE_PUGIXML_FORCE_ENABLE_LONG_LONG
> > +     bool "Force-enable long long support"
> > +     help
> > +       Force-enables support for long long type in pugixml.  Long
> > +       long support is automatically enabled if your platform is
> > +       known to have long long support (i.e. has C++11 support or
> > +       uses a reasonably modern version of a known compiler). If
> > +       pugixml does not recognize that your platform supports long
> > +       long but in fact it does, you can enable the define manually.
> > +endif
>
>  AFAIK gcc always supports long long, so shouldn't we just always enable
> this?
>

Gcc doc says:
https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html
"ISO C99 and ISO C++11 support data types for integers that are at least 64
bits wide, and as an extension GCC supports them in C90 and C++98 modes.
Simply write long long int for a signed integer, or unsigned long long int
for an unsigned integer."

So it seems you are right.
I will send an update later...

Thanks
Thomas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190202/e1dd4bcb/attachment.html>