All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency
@ 2019-02-12 22:45 Fabrice Fontaine
  2019-02-12 22:45 ` [Buildroot] [PATCH/next 2/2] package/libcpprestsdk: disable samples Fabrice Fontaine
  2019-02-15 21:38 ` [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency Thomas Petazzoni
  0 siblings, 2 replies; 4+ messages in thread
From: Fabrice Fontaine @ 2019-02-12 22:45 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk
index be9ca292c5..6f5fb41999 100644
--- a/package/libcpprestsdk/libcpprestsdk.mk
+++ b/package/libcpprestsdk/libcpprestsdk.mk
@@ -10,6 +10,13 @@ LIBCPPRESTSDK_LICENSE = MIT
 LIBCPPRESTSDK_LICENSE_FILES = license.txt
 LIBCPPRESTSDK_SUBDIR = Release
 LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
-LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON
+LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
+
+ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y)
+LIBCPPRESTSDK_DEPENDENCIES += websocketpp
+LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
+else
+LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=ON
+endif
 
 $(eval $(cmake-package))
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH/next 2/2] package/libcpprestsdk: disable samples
  2019-02-12 22:45 [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency Fabrice Fontaine
@ 2019-02-12 22:45 ` Fabrice Fontaine
  2019-02-15 21:31   ` Thomas Petazzoni
  2019-02-15 21:38 ` [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency Thomas Petazzoni
  1 sibling, 1 reply; 4+ messages in thread
From: Fabrice Fontaine @ 2019-02-12 22:45 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/libcpprestsdk/libcpprestsdk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk
index 6f5fb41999..763ba513d8 100644
--- a/package/libcpprestsdk/libcpprestsdk.mk
+++ b/package/libcpprestsdk/libcpprestsdk.mk
@@ -10,7 +10,7 @@ LIBCPPRESTSDK_LICENSE = MIT
 LIBCPPRESTSDK_LICENSE_FILES = license.txt
 LIBCPPRESTSDK_SUBDIR = Release
 LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
-LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
+LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF
 
 ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y)
 LIBCPPRESTSDK_DEPENDENCIES += websocketpp
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH/next 2/2] package/libcpprestsdk: disable samples
  2019-02-12 22:45 ` [Buildroot] [PATCH/next 2/2] package/libcpprestsdk: disable samples Fabrice Fontaine
@ 2019-02-15 21:31   ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-02-15 21:31 UTC (permalink / raw)
  To: buildroot

Hello Fabrice,

On Tue, 12 Feb 2019 23:45:47 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libcpprestsdk/libcpprestsdk.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Explicitly disabling the build of examples definitely makes sense to
have in master, so I've applied this patch to master. Thanks!

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency
  2019-02-12 22:45 [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency Fabrice Fontaine
  2019-02-12 22:45 ` [Buildroot] [PATCH/next 2/2] package/libcpprestsdk: disable samples Fabrice Fontaine
@ 2019-02-15 21:38 ` Thomas Petazzoni
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-02-15 21:38 UTC (permalink / raw)
  To: buildroot

On Tue, 12 Feb 2019 23:45:46 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

Applied to next, thanks.

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-15 21:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-12 22:45 [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency Fabrice Fontaine
2019-02-12 22:45 ` [Buildroot] [PATCH/next 2/2] package/libcpprestsdk: disable samples Fabrice Fontaine
2019-02-15 21:31   ` Thomas Petazzoni
2019-02-15 21:38 ` [Buildroot] [PATCH/next 1/2] package/libcpprestsdk: add optional websocketpp dependency Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.