[Buildroot] [PATCH v3 1/3] package/pugixml: Enable host build

[Buildroot] [PATCH v3 1/3] package/pugixml: Enable host build

[Bernd Kuhls]

Needed for host-waylandpp >= 0.2.5
https://github.com/NilsBrause/waylandpp/commit/433ce65b681c27d54e1e6b9a602f1c8291aabd54

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v3: no changes
v2: no changes

 package/pugixml/pugixml.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk
index 8edaddd827..6f214c4de8 100644
--- a/package/pugixml/pugixml.mk
+++ b/package/pugixml/pugixml.mk
@@ -31,3 +31,4 @@ PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES
 endif
 
 $(eval $(cmake-package))
+$(eval $(host-cmake-package))
-- 
2.20.1

[Buildroot] [PATCH v3 2/3] package/pugixml: enable install of pugixml.pc

[Bernd Kuhls]

Needed for waylandpp >= 0.2.4 to detect pugixml:
https://github.com/NilsBrause/waylandpp/commit/0a61175003a0a34038e39092918768360d2dd1da#diff-af3b638bc2a3e6c650974192a53c7291R39

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v3: no changes
v2: changed variables for HOST_PUGIXML_CONF_OPTS (Thomas)

 package/pugixml/pugixml.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk
index 6f214c4de8..368f958920 100644
--- a/package/pugixml/pugixml.mk
+++ b/package/pugixml/pugixml.mk
@@ -15,6 +15,7 @@ PUGIXML_INSTALL_STAGING = YES
 # force-enable this option to support older gcc versions. See also:
 # https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html
 PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
+HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
 
 ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),)
 PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH
@@ -30,5 +31,9 @@ ifdef PUGIXML_BUILD_DEFINES
 PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))"
 endif
 
+HOST_PUGIXML_CONF_OPTS += \
+	-DBUILD_PKGCONFIG=ON \
+	-DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))"
+
 $(eval $(cmake-package))
 $(eval $(host-cmake-package))
-- 
2.20.1

[Buildroot] [PATCH v3 3/3] package/waylandpp: bump version

[Bernd Kuhls]

Removed patch applied upstream:
https://github.com/NilsBrause/waylandpp/commit/242c2c9a188b1a972978fc05dbe70d102bc7c4e1

Bundled pugixml was removed:
https://github.com/NilsBrause/waylandpp/commit/433ce65b681c27d54e1e6b9a602f1c8291aabd54

Use host-pugixml instead and bump to HEAD to include a patch which
fixes a linking error:
https://github.com/NilsBrause/waylandpp/commit/41063c3e1de245bb7ea0c940e7400bd876bee25e

Updated license hash due to upstream commit:
https://github.com/NilsBrause/waylandpp/commit/f255d61ffd982614c0659be1742383dab06710a2

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v3: bump to HEAD to include a different patch to fix a linking error
    with pugixml. Adding the patch alone would require backporting more
    patches for CMakeLists.txt after the release of version 0.2.5:
    https://github.com/NilsBrause/waylandpp/commits/master/CMakeLists.txt
v2: add patch to fix pugixml linking error

 ...iler-error-missing-stdexcept-to-use-.patch | 28 -------------------
 package/waylandpp/waylandpp.hash              |  4 +--
 package/waylandpp/waylandpp.mk                |  5 ++--
 3 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch

diff --git a/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch b/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch
deleted file mode 100644
index ad5b84257f..0000000000
--- a/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 85b61589b0c73f6c6974862af678ed2f82806ac5 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Thu, 9 Aug 2018 21:44:46 +0200
-Subject: [PATCH] [scanner] Fix compiler error: missing <stdexcept> to use
- std::runtime_error
-
-Patch sent upstream as PR 50.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- scanner/scanner.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
-index 9c97b7c..7019e0a 100644
---- a/scanner/scanner.cpp
-+++ b/scanner/scanner.cpp
-@@ -22,6 +22,7 @@
- #include <sstream>
- #include <cctype>
- #include <cmath>
-+#include <stdexcept>
- 
- #include "pugixml.hpp"
- 
--- 
-2.18.0
-
diff --git a/package/waylandpp/waylandpp.hash b/package/waylandpp/waylandpp.hash
index 1b14814c47..c881514c12 100644
--- a/package/waylandpp/waylandpp.hash
+++ b/package/waylandpp/waylandpp.hash
@@ -1,4 +1,4 @@
 # Locally computed
-sha256 ebd4a8447bb65f288cad0e04538f6ec704e155213fc2b9cc1a851534c70aacac  waylandpp-0.2.3.tar.gz
-sha256 49aa6d728fd13226952c9e3a5a9cae46379b2a501010064760172b5ce7cd94bb  LICENSE
+sha256 1fca204f02297df4a3f6e2c8771f3e38946a2ac3ae195a8020638f46c3083c95  waylandpp-41063c3e1de245bb7ea0c940e7400bd876bee25e.tar.gz
+sha256 8ff91f682a38f8a603b173222a60e8dc71754a79a522a316fb6b76ce138c542c  LICENSE
 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  scanner/gpl-3.0.txt
diff --git a/package/waylandpp/waylandpp.mk b/package/waylandpp/waylandpp.mk
index ff17c35c1e..8f3ecfb134 100644
--- a/package/waylandpp/waylandpp.mk
+++ b/package/waylandpp/waylandpp.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-WAYLANDPP_VERSION = 0.2.3
+WAYLANDPP_VERSION = 41063c3e1de245bb7ea0c940e7400bd876bee25e
 WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION))
 WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner)
 WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt
 WAYLANDPP_INSTALL_STAGING = YES
-HOST_WAYLANDPP_DEPENDENCIES = host-pkgconf host-wayland
+# pugixml is needed only to build the host version of wayland-scanner++
+HOST_WAYLANDPP_DEPENDENCIES = host-pugixml host-pkgconf host-wayland
 WAYLANDPP_DEPENDENCIES = libegl host-pkgconf wayland host-waylandpp
 
 # host variant of wayland-scanner++ is needed for building the target
-- 
2.20.1

[Buildroot] [PATCH v3 2/3] package/pugixml: enable install of pugixml.pc

[Thomas Petazzoni]

On Sun, 16 Jun 2019 22:16:20 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Needed for waylandpp >= 0.2.4 to detect pugixml:
> https://github.com/NilsBrause/waylandpp/commit/0a61175003a0a34038e39092918768360d2dd1da#diff-af3b638bc2a3e6c650974192a53c7291R39
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v3: no changes
> v2: changed variables for HOST_PUGIXML_CONF_OPTS (Thomas)
> 
>  package/pugixml/pugixml.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/pugixml/pugixml.mk b/package/pugixml/pugixml.mk
> index 6f214c4de8..368f958920 100644
> --- a/package/pugixml/pugixml.mk
> +++ b/package/pugixml/pugixml.mk
> @@ -15,6 +15,7 @@ PUGIXML_INSTALL_STAGING = YES
>  # force-enable this option to support older gcc versions. See also:
>  # https://gcc.gnu.org/onlinedocs/gcc/Long-Long.html
>  PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG
> +HOST_PUGIXML_BUILD_DEFINES += PUGIXML_HAS_LONG_LONG

How is this related to install the .pc file ? Shouldn't this go in PATCH 1/3 ?

>  
>  ifeq ($(BR2_PACKAGE_PUGIXML_XPATH_SUPPORT),)
>  PUGIXML_BUILD_DEFINES += PUGIXML_NO_XPATH
> @@ -30,5 +31,9 @@ ifdef PUGIXML_BUILD_DEFINES
>  PUGIXML_CONF_OPTS += -DBUILD_DEFINES="$(subst $(space),;,$(PUGIXML_BUILD_DEFINES))"
>  endif
>  
> +HOST_PUGIXML_CONF_OPTS += \
> +	-DBUILD_PKGCONFIG=ON \

I understand why this is in this patch.

> +	-DBUILD_DEFINES="$(subst $(space),;,$(HOST_PUGIXML_BUILD_DEFINES))"

But this should be in PATCH 1/3, no ?

In fact, is it really useful to split PATCH 1/3 and 2/3 ? Both are just
about enabling the host variant of pugixml, we don't really need to
separate the installation of the .pc file in another patch.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v3 1/3] package/pugixml: Enable host build

[Thomas Petazzoni]

On Sun, 16 Jun 2019 22:16:19 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Needed for host-waylandpp >= 0.2.5
> https://github.com/NilsBrause/waylandpp/commit/433ce65b681c27d54e1e6b9a602f1c8291aabd54
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> v3: no changes
> v2: no changes

I've applied to master, after squashing PATCH 2/3 into this one. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v3 3/3] package/waylandpp: bump version

[Thomas Petazzoni]

Hello,

On Sun, 16 Jun 2019 22:16:21 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:

> Removed patch applied upstream:
> https://github.com/NilsBrause/waylandpp/commit/242c2c9a188b1a972978fc05dbe70d102bc7c4e1
> 
> Bundled pugixml was removed:
> https://github.com/NilsBrause/waylandpp/commit/433ce65b681c27d54e1e6b9a602f1c8291aabd54
> 
> Use host-pugixml instead and bump to HEAD to include a patch which
> fixes a linking error:
> https://github.com/NilsBrause/waylandpp/commit/41063c3e1de245bb7ea0c940e7400bd876bee25e
> 
> Updated license hash due to upstream commit:
> https://github.com/NilsBrause/waylandpp/commit/f255d61ffd982614c0659be1742383dab06710a2
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Thanks, applied to master. Could you ask upstream to cut a new release,
since the recent fixes are quite important ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com