Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,55 +0,0 @@
|
||||
From 913c2cc740d60450e91e066cf38f5654936a6015 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Cercueil <paul.cercueil@analog.com>
|
||||
Date: Mon, 6 Feb 2017 14:04:47 +0100
|
||||
Subject: [PATCH] utilities.c: Add a check for newlocale() function
|
||||
|
||||
uClibc might define __UCLIBC_HAS_LOCALE__, without actually providing
|
||||
the locale_t type or the setlocale() function.
|
||||
|
||||
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
iio-config.h.cmakein | 1 +
|
||||
utilities.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cb3a48f..b24eff3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -66,6 +66,7 @@ endif()
|
||||
include(CheckSymbolExists)
|
||||
check_symbol_exists(strdup "string.h" HAS_STRDUP)
|
||||
check_symbol_exists(strerror_r "string.h" HAS_STRERROR_R)
|
||||
+check_symbol_exists(newlocale "locale.h" HAS_NEWLOCALE)
|
||||
|
||||
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
option(WITH_IIOD "Build the IIO Daemon" ON)
|
||||
diff --git a/iio-config.h.cmakein b/iio-config.h.cmakein
|
||||
index 1b8608e..6700326 100644
|
||||
--- a/iio-config.h.cmakein
|
||||
+++ b/iio-config.h.cmakein
|
||||
@@ -21,6 +21,7 @@
|
||||
#cmakedefine HAS_PIPE2
|
||||
#cmakedefine HAS_STRDUP
|
||||
#cmakedefine HAS_STRERROR_R
|
||||
+#cmakedefine HAS_NEWLOCALE
|
||||
#cmakedefine HAS_PTHREAD_SETNAME_NP
|
||||
#cmakedefine HAVE_IPV6
|
||||
#cmakedefine HAVE_AVAHI
|
||||
diff --git a/utilities.c b/utilities.c
|
||||
index 88b8257..21dbd10 100644
|
||||
--- a/utilities.c
|
||||
+++ b/utilities.c
|
||||
@@ -34,7 +34,7 @@
|
||||
#endif
|
||||
|
||||
#ifdef LOCALE_SUPPORT
|
||||
-#if defined(__MINGW32__)
|
||||
+#if defined(__MINGW32__) || (!defined(_WIN32) && !defined(HAS_NEWLOCALE))
|
||||
static int read_double_locale(const char *str, double *val)
|
||||
{
|
||||
char *end, *old_locale;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -17,24 +17,24 @@ config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_XML_BACKEND
|
||||
bool "XML backend"
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
default y
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
help
|
||||
Enable the XML backend of the library.
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
|
||||
bool "Network backend"
|
||||
select BR2_PACKAGE_LIBIIO_XML_BACKEND
|
||||
default y
|
||||
select BR2_PACKAGE_LIBIIO_XML_BACKEND
|
||||
help
|
||||
Enable the network backend of the library.
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_USB_BACKEND
|
||||
bool "USB backend"
|
||||
default y
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb
|
||||
select BR2_PACKAGE_LIBIIO_XML_BACKEND
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
default y
|
||||
help
|
||||
Enable the USB backend of the library.
|
||||
|
||||
@@ -43,18 +43,17 @@ comment "The USB backend needs a toolchain w/ threads"
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND
|
||||
bool "Serial backend"
|
||||
default y
|
||||
select BR2_PACKAGE_LIBIIO_XML_BACKEND
|
||||
select BR2_PACKAGE_LIBSERIALPORT
|
||||
default y
|
||||
help
|
||||
Enable the serial backend of the library.
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_IIOD
|
||||
bool "IIO Daemon"
|
||||
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_bfin
|
||||
default y
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
|
||||
help
|
||||
Install the IIO Daemon.
|
||||
|
||||
@@ -74,16 +73,9 @@ comment "USB support in the IIO Daemon requires libaio, headers >= 3.18"
|
||||
|
||||
comment "IIO Daemon needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_bfin
|
||||
|
||||
comment "IIO Daemon is not yet available on Blackfin"
|
||||
depends on BR2_bfin
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_TESTS
|
||||
bool "Install test programs"
|
||||
select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
|
||||
select BR2_PACKAGE_LIBIIO_XML_BACKEND
|
||||
select BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
Install the test programs (iio_info, iio_genxml, iio_readdev).
|
||||
@@ -99,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP
|
||||
|
||||
config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON
|
||||
bool "Install Python bindings"
|
||||
depends on BR2_PACKAGE_PYTHON
|
||||
depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
|
||||
help
|
||||
Install the Python bindings.
|
||||
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://github.com/analogdevicesinc/libiio/archive/v0.9/
|
||||
sha256 b6184876d192fbfd51e3a0a29736fa1be2dbaf07370cf861797076f40a85f823 libiio-0.9.tar.gz
|
||||
# Locally calculated
|
||||
sha256 002d57f35715821efae66479859bc5357b4d8d33bfff1446b4e17b02ae2c10d2 libiio-0.10.tar.gz
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBIIO_VERSION = 0.9
|
||||
LIBIIO_VERSION = 0.10
|
||||
LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
|
||||
LIBIIO_INSTALL_STAGING = YES
|
||||
LIBIIO_LICENSE = LGPLv2.1+
|
||||
LIBIIO_LICENSE = LGPL-2.1+
|
||||
LIBIIO_LICENSE_FILES = COPYING.txt
|
||||
|
||||
LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \
|
||||
@@ -60,7 +60,11 @@ LIBIIO_DEPENDENCIES += avahi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y)
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
LIBIIO_DEPENDENCIES += python
|
||||
else ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
LIBIIO_DEPENDENCIES += python3
|
||||
endif
|
||||
LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON
|
||||
else
|
||||
LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF
|
||||
@@ -69,11 +73,11 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP),y)
|
||||
define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET
|
||||
rm $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll.mdb
|
||||
$(HOST_DIR)/usr/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \
|
||||
$(HOST_DIR)/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \
|
||||
$(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll
|
||||
endef
|
||||
define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_STAGING
|
||||
$(HOST_DIR)/usr/bin/gacutil -root $(STAGING_DIR)/usr/lib -i \
|
||||
$(HOST_DIR)/bin/gacutil -root $(STAGING_DIR)/usr/lib -i \
|
||||
$(STAGING_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll
|
||||
endef
|
||||
LIBIIO_POST_INSTALL_TARGET_HOOKS += LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET
|
||||
|
||||
Reference in New Issue
Block a user