Bump buildroot to 2019.02
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_RABBITMQ_C
|
||||
bool "rabbitmq-c"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
This is a C-language AMQP client library for use with v2.0+
|
||||
@@ -7,5 +8,5 @@ config BR2_PACKAGE_RABBITMQ_C
|
||||
|
||||
https://github.com/alanxz/rabbitmq-c
|
||||
|
||||
comment "rabbitmq-c needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
comment "rabbitmq-c needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b rabbitmq-c-v0.8.0.tar.gz
|
||||
sha256 316c0d156452b488124806911a62e0c2aa8a546d38fc8324719cd29aaa493024 rabbitmq-c-v0.9.0.tar.gz
|
||||
sha256 94a12c906acb31a66c2c8a6c1b6e46cab52bc5694c5ada2a06d86b05d3d3f422 LICENSE-MIT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RABBITMQ_C_VERSION = v0.8.0
|
||||
RABBITMQ_C_VERSION = v0.9.0
|
||||
RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,$(RABBITMQ_C_VERSION))
|
||||
RABBITMQ_C_LICENSE = MIT
|
||||
RABBITMQ_C_LICENSE_FILES = LICENSE-MIT
|
||||
@@ -13,29 +13,26 @@ RABBITMQ_C_CONF_OPTS = \
|
||||
-DBUILD_API_DOCS=OFF \
|
||||
-DBUILD_TOOLS_DOCS=OFF
|
||||
|
||||
# Before CMake 3.10, passing THREADS_PTHREAD_ARG=OFF was needed to
|
||||
# disable a try_run() call in the FindThreads tests, which caused a
|
||||
# build failure when cross-compiling.
|
||||
RABBITMQ_C_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
|
||||
|
||||
# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
|
||||
endif
|
||||
|
||||
# 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:)
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=ON
|
||||
RABBITMQ_C_DEPENDENCIES += openssl
|
||||
else
|
||||
RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=OFF
|
||||
endif
|
||||
|
||||
# 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:)
|
||||
ifeq ($(BR2_PACKAGE_POPT),y)
|
||||
RABBITMQ_C_CONF_OPTS += -DBUILD_TOOLS=ON
|
||||
RABBITMQ_C_DEPENDENCIES += popt
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user