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

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bsp/buildroot/package/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch Normal file
View File

@@ -0,0 +1,32 @@
From 88fee5c6eb2271d3de6b9878cd29a0494999aa18 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Sun, 20 Nov 2016 23:46:45 +0100
Subject: [PATCH] Use correct variables for GnuTLS detection
At least with recent CMake, it seems the variables created by
find_package (GnuTLS) are called PC_GNUTLS_INCLUDE_DIRS and
PC_GNUTLS_LIBRARIES.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8125d9..ccf827b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,8 +110,8 @@ message ("-- Looking for GnuTLS")
find_package (GnuTLS REQUIRED)
if (GNUTLS_FOUND)
set (HAVE_LIBGNUTLS true)
- set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR})
- set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${GNUTLS_LIBRARIES})
+ set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${PC_GNUTLS_INCLUDE_DIRS})
+ set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${PC_GNUTLS_LIBRARIES})
endif (GNUTLS_FOUND)
message ("-- Looking for libuuid")
--
2.10.2

40
bsp/buildroot/package/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch Normal file
View File

@@ -0,0 +1,40 @@
CMakeLists.txt: use pkg-config to detect uuid when possible
In order to take into account the libraries used by libuuid when
building statically, using pkg-config is recommended. This patch
therefore improves the CMakeLists.txt to use pkg-config to detect
libuuid when pkg-config is available.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: b/CMakeLists.txt
===================================================================
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@
include (CheckFunctionExists)
include (CheckStructHasMember)
+include (FindPkgConfig)
set (HAVE_CMAKE true)
@@ -119,8 +120,16 @@
# Apple and FreeBSD include the uuid functions in their libc, rather than libuuid
check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
else (DARWIN OR FREEBSD)
- find_path (UUID_INCLUDE_DIR uuid/uuid.h)
- find_library (UUID_LIBRARY NAMES uuid)
+ if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_UUID uuid)
+ if(PC_UUID_FOUND)
+ set (UUID_INCLUDE_DIR ${PC_UUID_INCLUDE_DIRS})
+ set (UUID_LIBRARY ${PC_UUID_LIBRARIES})
+ endif(PC_UUID_FOUND)
+ else(PKG_CONFIG_FOUND)
+ find_path (UUID_INCLUDE_DIR uuid/uuid.h)
+ find_library (UUID_LIBRARY NAMES uuid)
+ endif(PKG_CONFIG_FOUND)
if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${UUID_INCLUDE_DIR})
set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${UUID_LIBRARY})

2
bsp/buildroot/package/taskd/Config.in
View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_TASKD
bool "taskd"
depends on BR2_USE_WCHAR # gnutls, util-linux
depends on BR2_USE_WCHAR # gnutls
depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_GNUTLS

2
bsp/buildroot/package/taskd/taskd.mk
View File

@@ -8,6 +8,6 @@ TASKD_VERSION = 1.1.0
TASKD_SITE = http://taskwarrior.org/download
TASKD_LICENSE = MIT
TASKD_LICENSE_FILES = COPYING
TASKD_DEPENDENCIES = gnutls util-linux
TASKD_DEPENDENCIES = gnutls util-linux host-pkgconf
$(eval $(cmake-package))