mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,28 @@
|
||||
From b067ab9bf667bb9257bb9eeaa6bf25f9a1a17f06 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Fri, 6 May 2016 23:35:42 +0200
|
||||
Subject: [PATCH] Fix missing cmakedefine HAVE_GET_CURRENT_DIR_NAME
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
cmake.h.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/cmake.h.in b/cmake.h.in
|
||||
index 4124ce9..0b8f9d0 100644
|
||||
--- a/cmake.h.in
|
||||
+++ b/cmake.h.in
|
||||
@@ -51,6 +51,7 @@
|
||||
#cmakedefine HAVE_ST_BIRTHTIME
|
||||
|
||||
/* Functions */
|
||||
+#cmakedefine HAVE_GET_CURRENT_DIR_NAME
|
||||
#cmakedefine HAVE_TIMEGM
|
||||
#cmakedefine HAVE_UUID_UNPARSE_LOWER
|
||||
|
||||
--
|
||||
2.8.2
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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})
|
||||
18
package/taskd/Config.in
Normal file
18
package/taskd/Config.in
Normal file
@@ -0,0 +1,18 @@
|
||||
config BR2_PACKAGE_TASKD
|
||||
bool "taskd"
|
||||
depends on !BR2_STATIC_LIBS # gnutls
|
||||
depends on BR2_USE_WCHAR # gnutls
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
|
||||
help
|
||||
Task management synchronization daemon.
|
||||
|
||||
http://taskwarrior.org/
|
||||
|
||||
comment "taskd needs a toolchain w/ C++, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
|
||||
BR2_STATIC_LIBS
|
||||
4
package/taskd/taskd.hash
Normal file
4
package/taskd/taskd.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# From http://taskwarrior.org/download/
|
||||
sha1 ded339deeee65277e4712f71a9159502f8b20b52 taskd-1.1.0.tar.gz
|
||||
# Locally calculated
|
||||
sha256 7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 taskd-1.1.0.tar.gz
|
||||
13
package/taskd/taskd.mk
Normal file
13
package/taskd/taskd.mk
Normal file
@@ -0,0 +1,13 @@
|
||||
################################################################################
|
||||
#
|
||||
# taskd
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TASKD_VERSION = 1.1.0
|
||||
TASKD_SITE = http://taskwarrior.org/download
|
||||
TASKD_LICENSE = MIT
|
||||
TASKD_LICENSE_FILES = COPYING
|
||||
TASKD_DEPENDENCIES = gnutls util-linux host-pkgconf
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user