rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update buildroot from 17.02.2 -> 17.02.3

Browse Source
This commit is contained in:
jbnadal
2018-01-04 14:25:23 +01:00
parent 01d7c53e3e
commit d83c6ae740
285 changed files with 5286 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bsp/buildroot/package/rabbitmq-c/rabbitmq-c.mk
View File

@@ -21,14 +21,20 @@ else ifeq ($(BR2_SHARED_LIBS),y)
RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
# CMake OpenSSL detection is buggy, and doesn't properly use
# pkg-config, so it fails when statically linking. See
# https://gitlab.kitware.com/cmake/cmake/issues/16885.
ifeq ($(BR2_PACKAGE_OPENSSL):$(BR2_STATIC_LIBS),y:)
RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=ON
RABBITMQ_C_DEPENDENCIES += openssl
else
RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=OFF
endif
ifeq ($(BR2_PACKAGE_POPT), y)
# Popt is sometimes linked against libintl, but CMake doesn't know
# about that, and there's no way to tell manually CMake to link
# against an additional library.
ifeq ($(BR2_PACKAGE_POPT):$(BR2_STATIC_LIBS),y:)
RABBITMQ_C_CONF_OPTS += -DBUILD_TOOLS=ON
RABBITMQ_C_DEPENDENCIES += popt
else