initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,47 @@
|
||||
From 0ce382c275b087e866517c003e565f8cc4855bdd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 29 Aug 2020 23:19:26 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: do not force SHARED
|
||||
|
||||
Allow the user to build static libraries by removing SHARED from
|
||||
ADD_LIBRARY calls.
|
||||
|
||||
Here is an extract of
|
||||
https://cmake.org/cmake/help/latest/command/add_library.html:
|
||||
|
||||
"If no type is given explicitly the type is STATIC or SHARED based on
|
||||
whether the current value of the variable BUILD_SHARED_LIBS is ON."
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: probably not upstreamable as is because it will
|
||||
conflict with https://github.com/redis/hiredis/pull/851. So, this patch
|
||||
will probably have to be reworked for 1.0.x]
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1beccc6..fed79fd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@ IF(WIN32)
|
||||
ADD_COMPILE_DEFINITIONS(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN)
|
||||
ENDIF()
|
||||
|
||||
-ADD_LIBRARY(hiredis SHARED ${hiredis_sources})
|
||||
+ADD_LIBRARY(hiredis ${hiredis_sources})
|
||||
|
||||
SET_TARGET_PROPERTIES(hiredis
|
||||
PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE
|
||||
@@ -97,7 +97,7 @@ IF(ENABLE_SSL)
|
||||
FIND_PACKAGE(OpenSSL REQUIRED)
|
||||
SET(hiredis_ssl_sources
|
||||
ssl.c)
|
||||
- ADD_LIBRARY(hiredis_ssl SHARED
|
||||
+ ADD_LIBRARY(hiredis_ssl
|
||||
${hiredis_ssl_sources})
|
||||
|
||||
IF (APPLE)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
From bb4a8937411a9e6ac2e5c12c0e7eeaa7dab251ba Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 5 Sep 2020 12:54:21 +0200
|
||||
Subject: [PATCH] CMakeLists.txt: allow building without a C++ compiler
|
||||
|
||||
Define hiredis as a C project (and use a single PROJECT statement) to
|
||||
avoid the following build failure if a C++ compiler is not found:
|
||||
|
||||
CMake Error at CMakeLists.txt:3 (PROJECT):
|
||||
The CMAKE_CXX_COMPILER:
|
||||
|
||||
/srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++
|
||||
|
||||
is not a full path to an existing compiler tool.
|
||||
|
||||
Tell CMake where to find the compiler by setting either the environment
|
||||
variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path
|
||||
to the compiler, or to the compiler name if it is in the PATH.
|
||||
|
||||
The only cpp source file is examples/example-qt.cpp which is never
|
||||
compiled with cmake buildsystem. This file is compiled only with the
|
||||
Makefile buildsystem so perhaps it should be removed. If it is added to
|
||||
the cmake buildsystem, a call to enable_language(CXX) will have to be
|
||||
added.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/redis/hiredis/pull/872]
|
||||
---
|
||||
CMakeLists.txt | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4cbd438..9d65b7f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,6 +1,5 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 3.4.0)
|
||||
INCLUDE(GNUInstallDirs)
|
||||
-PROJECT(hiredis)
|
||||
|
||||
OPTION(ENABLE_SSL "Build hiredis_ssl for SSL support" OFF)
|
||||
OPTION(DISABLE_TESTS "If tests should be compiled or not" OFF)
|
||||
@@ -20,7 +19,7 @@ getVersionBit(HIREDIS_SONAME)
|
||||
SET(VERSION "${HIREDIS_MAJOR}.${HIREDIS_MINOR}.${HIREDIS_PATCH}")
|
||||
MESSAGE("Detected version: ${VERSION}")
|
||||
|
||||
-PROJECT(hiredis VERSION "${VERSION}")
|
||||
+PROJECT(hiredis LANGUAGES "C" VERSION "${VERSION}")
|
||||
|
||||
# Hiredis requires C99
|
||||
SET(CMAKE_C_STANDARD 99)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 13a35bdb64615e381c5e1151cdd4e78bba71a6db Mon Sep 17 00:00:00 2001
|
||||
From: michael-grunder <michael.grunder@gmail.com>
|
||||
Date: Fri, 28 Aug 2020 12:35:01 -0700
|
||||
Subject: [PATCH] Explicitly set c99 in CMake
|
||||
|
||||
See #869
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/redis/hiredis/commit/13a35bdb64615e381c5e1151cdd4e78bba71a6db]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1beccc69a..4cbd438d7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -22,6 +22,9 @@ MESSAGE("Detected version: ${VERSION}")
|
||||
|
||||
PROJECT(hiredis VERSION "${VERSION}")
|
||||
|
||||
+# Hiredis requires C99
|
||||
+SET(CMAKE_C_STANDARD 99)
|
||||
+
|
||||
SET(ENABLE_EXAMPLES OFF CACHE BOOL "Enable building hiredis examples")
|
||||
|
||||
SET(hiredis_sources
|
||||
@@ -0,0 +1,12 @@
|
||||
config BR2_PACKAGE_HIREDIS
|
||||
bool "hiredis"
|
||||
help
|
||||
Minimalistic C client for Redis >= 1.2
|
||||
|
||||
It is minimalistic because it just adds minimal support for
|
||||
the protocol, but at the same time it uses a high level
|
||||
printf-alike API in order to make it much higher level than
|
||||
otherwise suggested by its minimal code base and the lack of
|
||||
explicit bindings for every Redis command.
|
||||
|
||||
https://github.com/redis/hiredis
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 e0ab696e2f07deb4252dda45b703d09854e53b9703c7d52182ce5a22616c3819 hiredis-1.0.2.tar.gz
|
||||
sha256 dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb COPYING
|
||||
@@ -0,0 +1,23 @@
|
||||
################################################################################
|
||||
#
|
||||
# hiredis
|
||||
#
|
||||
################################################################################
|
||||
|
||||
HIREDIS_VERSION_MAJOR = 1.0
|
||||
HIREDIS_VERSION = $(HIREDIS_VERSION_MAJOR).2
|
||||
HIREDIS_SITE = $(call github,redis,hiredis,v$(HIREDIS_VERSION))
|
||||
HIREDIS_LICENSE = BSD-3-Clause
|
||||
HIREDIS_LICENSE_FILES = COPYING
|
||||
HIREDIS_CPE_ID_VENDOR = redislabs
|
||||
HIREDIS_INSTALL_STAGING = YES
|
||||
HIREDIS_CONF_OPTS = -DDISABLE_TESTS=ON
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
HIREDIS_CONF_OPTS += -DENABLE_SSL=ON
|
||||
HIREDIS_DEPENDENCIES += openssl
|
||||
else
|
||||
HIREDIS_CONF_OPTS += -DENABLE_SSL=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user