From patchwork Thu May 30 12:01:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1107746 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45F5m403q4z9s55 for ; Thu, 30 May 2019 22:01:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F1F548835D; Thu, 30 May 2019 12:01:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Dn7TU5ORhq7g; Thu, 30 May 2019 12:01:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3CD0E88359; Thu, 30 May 2019 12:01:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E0C131BF316 for ; Thu, 30 May 2019 12:01:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DB8DC83617 for ; Thu, 30 May 2019 12:01:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E0lIChdyeQHx for ; Thu, 30 May 2019 12:01:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by fraxinus.osuosl.org (Postfix) with ESMTPS id ACD358355C for ; Thu, 30 May 2019 12:01:43 +0000 (UTC) Received: from fwd33.aul.t-online.de (fwd33.aul.t-online.de [172.20.27.144]) by mailout11.t-online.de (Postfix) with SMTP id 9EB51422E0B9; Thu, 30 May 2019 14:01:41 +0200 (CEST) Received: from fli4l.lan.fli4l (XeZK56ZEZhDTS+BQq0v6uhIR4XWdn8X5dlZs3p9hxY+Wi9zv0B6JsBC4mJc-+VPwdL@[91.58.12.246]) by fwd33.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hWJka-25SSYa0; Thu, 30 May 2019 14:01:40 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:54648) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hWJkZ-0008Lm-OH; Thu, 30 May 2019 14:01:40 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 30 May 2019 14:01:37 +0200 Message-Id: <20190530120139.21740-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: XeZK56ZEZhDTS+BQq0v6uhIR4XWdn8X5dlZs3p9hxY+Wi9zv0B6JsBC4mJc-+VPwdL X-TOI-MSGID: 86396ce2-ddbf-4ac2-ac03-1d922a5c9d11 Subject: [Buildroot] [PATCH/next v2 1/3] package/pugixml: Enable host build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Theo Debrouwere Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Needed for host-waylandpp >= 0.2.5 https://github.com/NilsBrause/waylandpp/commit/433ce65b681c27d54e1e6b9a602f1c8291aabd54 Signed-off-by: Bernd Kuhls --- 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)) From patchwork Thu May 30 12:01:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1107744 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45F5m06wC3z9s9T for ; Thu, 30 May 2019 22:01:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 91202845D2; Thu, 30 May 2019 12:01:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nQhxlu---9GN; Thu, 30 May 2019 12:01:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0389383617; Thu, 30 May 2019 12:01:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 526241BF316 for ; Thu, 30 May 2019 12:01:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F83888359 for ; Thu, 30 May 2019 12:01:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0V8vlpzBcXHN for ; Thu, 30 May 2019 12:01:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout03.t-online.de (mailout03.t-online.de [194.25.134.81]) by hemlock.osuosl.org (Postfix) with ESMTPS id ED1ED881DE for ; Thu, 30 May 2019 12:01:43 +0000 (UTC) Received: from fwd32.aul.t-online.de (fwd32.aul.t-online.de [172.20.26.144]) by mailout03.t-online.de (Postfix) with SMTP id 9C6594238662; Thu, 30 May 2019 14:01:41 +0200 (CEST) Received: from fli4l.lan.fli4l (GQhRE8ZvZhWiv8T8bCvP61jdR-klyjF7MEDv9R09wMxdUEwIMcjNrLnwCIWVnMGgFv@[91.58.12.246]) by fwd32.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hWJkb-0KRfSi0; Thu, 30 May 2019 14:01:41 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:54648) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hWJka-0008Lm-7j; Thu, 30 May 2019 14:01:40 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 30 May 2019 14:01:38 +0200 Message-Id: <20190530120139.21740-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530120139.21740-1-bernd.kuhls@t-online.de> References: <20190530120139.21740-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: GQhRE8ZvZhWiv8T8bCvP61jdR-klyjF7MEDv9R09wMxdUEwIMcjNrLnwCIWVnMGgFv X-TOI-MSGID: 31e1eddc-81d8-4c47-8ff8-006c82f0bf78 Subject: [Buildroot] [PATCH/next v2 2/3] package/pugixml: enable install of pugixml.pc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Theo Debrouwere Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Needed for waylandpp >= 0.2.4 to detect pugixml: https://github.com/NilsBrause/waylandpp/commit/0a61175003a0a34038e39092918768360d2dd1da#diff-af3b638bc2a3e6c650974192a53c7291R39 Signed-off-by: Bernd Kuhls --- 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)) From patchwork Thu May 30 12:01:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1107745 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45F5m13l1rz9s5c for ; Thu, 30 May 2019 22:01:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DE4887658; Thu, 30 May 2019 12:01:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DISJfU4d-A+j; Thu, 30 May 2019 12:01:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E65C28765A; Thu, 30 May 2019 12:01:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3E1CD1BF316 for ; Thu, 30 May 2019 12:01:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 38F632037A for ; Thu, 30 May 2019 12:01:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0uuc5GsksTUA for ; Thu, 30 May 2019 12:01:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by silver.osuosl.org (Postfix) with ESMTPS id 22E0F20117 for ; Thu, 30 May 2019 12:01:44 +0000 (UTC) Received: from fwd01.aul.t-online.de (fwd01.aul.t-online.de [172.20.27.147]) by mailout10.t-online.de (Postfix) with SMTP id D639B41BCC0D; Thu, 30 May 2019 14:01:41 +0200 (CEST) Received: from fli4l.lan.fli4l (TECgp+ZvwhKqvXYNTI-grx2Kz35sKCafYS8qHABYabTHqQvdDorQVUcz+0q6ZuXZ5X@[91.58.12.246]) by fwd01.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1hWJkb-18196G0; Thu, 30 May 2019 14:01:41 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:54648) by fli4l.lan.fli4l with esmtp (Exim 4.92) (envelope-from ) id 1hWJka-0008Lm-M2; Thu, 30 May 2019 14:01:41 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 30 May 2019 14:01:39 +0200 Message-Id: <20190530120139.21740-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530120139.21740-1-bernd.kuhls@t-online.de> References: <20190530120139.21740-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-ID: TECgp+ZvwhKqvXYNTI-grx2Kz35sKCafYS8qHABYabTHqQvdDorQVUcz+0q6ZuXZ5X X-TOI-MSGID: 1457ba3c-d971-4ac3-9955-73a5445b44eb Subject: [Buildroot] [PATCH/next v2 3/3] package/waylandpp: bump version to 0.2.5 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Theo Debrouwere Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 added patch to fix linking error. Updated license hash due to upstream commit: https://github.com/NilsBrause/waylandpp/commit/f255d61ffd982614c0659be1742383dab06710a2 Signed-off-by: Bernd Kuhls --- v2: add patch to fix pugixml linking error .../0001-fix-linking-with-pugixml.patch | 39 +++++++++++++++++++ ...iler-error-missing-stdexcept-to-use-.patch | 28 ------------- package/waylandpp/waylandpp.hash | 4 +- package/waylandpp/waylandpp.mk | 5 ++- 4 files changed, 44 insertions(+), 32 deletions(-) create mode 100644 package/waylandpp/0001-fix-linking-with-pugixml.patch delete mode 100644 package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch diff --git a/package/waylandpp/0001-fix-linking-with-pugixml.patch b/package/waylandpp/0001-fix-linking-with-pugixml.patch new file mode 100644 index 0000000000..1140a2b876 --- /dev/null +++ b/package/waylandpp/0001-fix-linking-with-pugixml.patch @@ -0,0 +1,39 @@ +From ad896b3a4d9a85416d21d2f56f1b1329cfb3291d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Thu, 30 May 2019 13:39:19 +0200 +Subject: [PATCH] fix linking with pugixml + +Linking wayland-scanner++ fails + +[100%] Linking CXX executable wayland-scanner++ +/usr/bin/ld: cannot find -lpugixml + +when libpugixml.so is not installed in default location + +bernd@buildroot:~/buildroot/br9_next/output/build/host-waylandpp-0.2.5$ grep PUGIXML_LDFLAGS CMakeCache.txt +PUGIXML_LDFLAGS:INTERNAL=-L/home/bernd/buildroot/br9_next/output/host/lib/pugixml-1.9;-lpugixml +PUGIXML_LDFLAGS_OTHER:INTERNAL= + +Patch sent upstream as PR 59. + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f8f76dc..a970d2d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -57,7 +57,7 @@ set(CMAKE_CXX_STANDARD 11) + if(BUILD_SCANNER) + pkg_check_modules(PUGIXML REQUIRED "pugixml>=1.4") + add_executable(wayland-scanner++ scanner/scanner.cpp) +- target_link_libraries(wayland-scanner++ ${PUGIXML_LIBRARIES}) ++ target_link_libraries(wayland-scanner++ ${PUGIXML_LDFLAGS} ${PUGIXML_LIBRARIES}) + target_compile_options(wayland-scanner++ PUBLIC ${PUGIXML_CFLAGS}) + configure_file(wayland-scanner++.pc.in wayland-scanner++.pc @ONLY) + install(TARGETS wayland-scanner++ RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}") +-- +2.20.1 + 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 -Date: Thu, 9 Aug 2018 21:44:46 +0200 -Subject: [PATCH] [scanner] Fix compiler error: missing to use - std::runtime_error - -Patch sent upstream as PR 50. - -Signed-off-by: Bernd Kuhls ---- - 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 - #include - #include -+#include - - #include "pugixml.hpp" - --- -2.18.0 - diff --git a/package/waylandpp/waylandpp.hash b/package/waylandpp/waylandpp.hash index 1b14814c47..fb88573ee5 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 5a4361f73d2bee65bfe54b954ce085c9bfc7bc4429ac2bdc97c10e3b84660907 waylandpp-0.2.5.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..bb532103a2 100644 --- a/package/waylandpp/waylandpp.mk +++ b/package/waylandpp/waylandpp.mk @@ -4,12 +4,13 @@ # ################################################################################ -WAYLANDPP_VERSION = 0.2.3 +WAYLANDPP_VERSION = 0.2.5 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