update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,38 @@
|
||||
From b8417607ec8840e6a1e27cf03b6958c794a33e49 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 4 Aug 2015 10:14:00 +0200
|
||||
Subject: [PATCH 1/2] poco: add the staging path to search path
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Add the mysql headers and client libraries to the search path of the
|
||||
preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables
|
||||
must be set from the make command line.
|
||||
|
||||
[Peter: Remove host dirs, add MYSQL_INCDIR]
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
[Jörg: Update to version 1.6.1 from github]
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
Data/MySQL/Makefile | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile
|
||||
index 0b18ca5..094e807 100644
|
||||
--- a/Data/MySQL/Makefile
|
||||
+++ b/Data/MySQL/Makefile
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
include $(POCO_BASE)/build/rules/global
|
||||
|
||||
-SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient
|
||||
-INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include
|
||||
+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient
|
||||
+INCLUDE += -I$(MYSQL_INCDIR)
|
||||
SYSFLAGS += -DTHREADSAFE -DNO_TCL
|
||||
|
||||
objects = Binder Extractor SessionImpl Connector \
|
||||
--
|
||||
2.5.0
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
Fixes compile for m68k.
|
||||
|
||||
From upstream double-conversion commit da111796231:
|
||||
https://github.com/google/double-conversion/blob/master/double-conversion/utils.h
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur poco-poco-1.7.2-release.orig/Foundation/src/utils.h poco-poco-1.7.2-release/Foundation/src/utils.h
|
||||
--- poco-poco-1.7.2-release.orig/Foundation/src/utils.h 2016-03-19 08:19:35.000000000 +0100
|
||||
+++ poco-poco-1.7.2-release/Foundation/src/utils.h 2016-08-11 02:55:02.827238119 +0200
|
||||
@@ -63,6 +63,8 @@
|
||||
defined(__AARCH64EL__) || \
|
||||
defined(nios2) || defined(__nios2) || defined(__nios2__)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
+#elif defined(__mc68000__)
|
||||
+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
|
||||
#elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
|
||||
#if defined(_WIN32)
|
||||
// Windows uses a 64bit wide floating point stack.
|
||||
68
bsp/buildroot-2017.02.11/package/poco/Config.in
Normal file
68
bsp/buildroot-2017.02.11/package/poco/Config.in
Normal file
@@ -0,0 +1,68 @@
|
||||
config BR2_PACKAGE_POCO
|
||||
bool "poco"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
|
||||
|| BR2_or1k || BR2_xtensa)
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_PCRE
|
||||
help
|
||||
The C++ Portable Components Libraries
|
||||
|
||||
http://pocoproject.org
|
||||
|
||||
if BR2_PACKAGE_POCO
|
||||
|
||||
comment "poco components"
|
||||
|
||||
config BR2_PACKAGE_POCO_XML
|
||||
bool "xml"
|
||||
select BR2_PACKAGE_EXPAT
|
||||
|
||||
config BR2_PACKAGE_POCO_UTIL
|
||||
bool "util"
|
||||
select BR2_PACKAGE_POCO_XML
|
||||
|
||||
config BR2_PACKAGE_POCO_NET
|
||||
bool "net"
|
||||
|
||||
config BR2_PACKAGE_POCO_CRYPTO
|
||||
bool "crypto"
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_POCO_NETSSL_OPENSSL
|
||||
bool "netssl_openssl"
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
select BR2_PACKAGE_POCO_CRYPTO
|
||||
select BR2_PACKAGE_POCO_UTIL
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_POCO_ZIP
|
||||
bool "zip"
|
||||
select BR2_PACKAGE_POCO_XML
|
||||
select BR2_PACKAGE_POCO_NET
|
||||
select BR2_PACKAGE_POCO_UTIL
|
||||
|
||||
config BR2_PACKAGE_POCO_DATA
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_POCO_DATA_SQLITE
|
||||
bool "sqlite"
|
||||
select BR2_PACKAGE_POCO_DATA
|
||||
select BR2_PACKAGE_SQLITE
|
||||
|
||||
config BR2_PACKAGE_POCO_DATA_MYSQL
|
||||
bool "mysql"
|
||||
depends on BR2_USE_MMU # mysql
|
||||
select BR2_PACKAGE_POCO_DATA
|
||||
select BR2_PACKAGE_MYSQL
|
||||
|
||||
endif # BR2_PACKAGE_POCO
|
||||
|
||||
comment "poco needs a toolchain w/ wchar, threads, C++, dynamic library"
|
||||
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
|
||||
|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
|
||||
|| BR2_or1k || BR2_xtensa)
|
||||
3
bsp/buildroot-2017.02.11/package/poco/poco.hash
Normal file
3
bsp/buildroot-2017.02.11/package/poco/poco.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 cfd311ecbc9e58accf1c4ea70170af88f92f88e73dd14944e528e7f6229e6cab poco-poco-1.7.2-release.tar.gz
|
||||
sha256 32182791e7eac00ba367d2f22dd1dd5bfce0b6d6f76fd52f853364f98402dda3 30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch
|
||||
78
bsp/buildroot-2017.02.11/package/poco/poco.mk
Normal file
78
bsp/buildroot-2017.02.11/package/poco/poco.mk
Normal file
@@ -0,0 +1,78 @@
|
||||
################################################################################
|
||||
#
|
||||
# poco
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POCO_VERSION = poco-1.7.2-release
|
||||
POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION))
|
||||
POCO_LICENSE = Boost-v1.0
|
||||
POCO_LICENSE_FILES = LICENSE
|
||||
POCO_INSTALL_STAGING = YES
|
||||
POCO_PATCH = https://github.com/pocoproject/poco/commit/30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch
|
||||
|
||||
POCO_DEPENDENCIES = zlib pcre \
|
||||
$(if $(BR2_PACKAGE_POCO_XML),expat) \
|
||||
$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
|
||||
$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
|
||||
|
||||
POCO_OMIT = Data/ODBC PageCompiler \
|
||||
$(if $(BR2_PACKAGE_POCO_XML),,XML) \
|
||||
$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
|
||||
$(if $(BR2_PACKAGE_POCO_NET),,Net) \
|
||||
$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
|
||||
$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
|
||||
$(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
|
||||
$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
|
||||
|
||||
ifeq ($(LIBC),uclibc)
|
||||
POCO_CONF_OPTS += --no-fpenvironment --no-wstring
|
||||
endif
|
||||
|
||||
# architectures missing some FE_* in their fenv.h
|
||||
ifeq ($(BR2_sh4a)$(BR2_nios2),y)
|
||||
POCO_CONF_OPTS += --no-fpenvironment
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
POCO_MAKE_TARGET = static_release
|
||||
else ifeq ($(BR2_SHARED_LIBS),y)
|
||||
POCO_MAKE_TARGET = shared_release
|
||||
else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
POCO_MAKE_TARGET = all_release
|
||||
endif
|
||||
|
||||
define POCO_CONFIGURE_CMDS
|
||||
(cd $(@D); $(TARGET_MAKE_ENV) ./configure \
|
||||
--config=Linux \
|
||||
--prefix=/usr \
|
||||
--omit="$(POCO_OMIT)" \
|
||||
$(POCO_CONF_OPTS) \
|
||||
--unbundled \
|
||||
--no-tests \
|
||||
--no-samples)
|
||||
endef
|
||||
|
||||
# Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25)
|
||||
define POCO_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \
|
||||
MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \
|
||||
MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \
|
||||
DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D)
|
||||
endef
|
||||
|
||||
define POCO_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \
|
||||
DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D)
|
||||
endef
|
||||
|
||||
define POCO_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \
|
||||
DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user