Skip to contentSkip to conversation

package/libcpprestsdk: add optional websocketpp dependency

PATCH New Fabrice Fontaine 2 participants 4 messages Feb 12, 2019 – Feb 15, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/libcpprestsdk: add optional websocketpp dependency

---
 package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/libcpprestsdk/libcpprestsdk.mk +8 -1
index be9ca292c5..6f5fb41999 100644
@@ -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))
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/2 package/libcpprestsdk: disable samples

---
 package/libcpprestsdk/libcpprestsdk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libcpprestsdk/libcpprestsdk.mk +1 -1
index 6f5fb41999..763ba513d8 100644
@@ -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
Signature · 1 line
2.14.1
#2 lore raw

PATCH 2/2 package/libcpprestsdk: disable samples

Hello Fabrice,

Quoted 4 lines · On Tue, 12 Feb 2019 23:45:47 +0100 Fabrice Fontaine…
---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/libcpprestsdk: add optional websocketpp dependency

In reply to Fabrice Fontaine
Quoted 4 lines · On Tue, 12 Feb 2019 23:45:46 +0100 Fabrice Fontaine…
---
 package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com