From: Peter Korsgaard Date: Tue, 5 Mar 2019 09:59:38 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da49312af9e0c3e7f6df50e7d6f77e1fa2921b7a;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- da49312af9e0c3e7f6df50e7d6f77e1fa2921b7a diff --cc DEVELOPERS index f9b6a0e7d7,f192927225..bff5a58a5b --- a/DEVELOPERS +++ b/DEVELOPERS @@@ -49,11 -49,9 +49,12 @@@ F: package/libressl F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ +F: package/libwebsockets/ F: package/nginx-naxsi/ + F: package/openjdk-bin/ +F: package/php/ F: package/policycoreutils/ +F: package/python3/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ F: package/python-pip/ diff --cc package/libcpprestsdk/libcpprestsdk.mk index a03e6d250b,6f5fb41999..d527aaad98 --- a/package/libcpprestsdk/libcpprestsdk.mk +++ b/package/libcpprestsdk/libcpprestsdk.mk @@@ -10,10 -10,13 +10,17 @@@ LIBCPPRESTSDK_LICENSE = MI LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib - LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON -DBUILD_SAMPLES=OFF -LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF ++LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +endif + 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))