From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/hiredis: fix build without C++
Date: Sat, 5 Sep 2020 12:59:13 +0200 [thread overview]
Message-ID: <20200905105913.50960-1-fontaine.fabrice@gmail.com> (raw)
This patch is needed to fix a build failure with hiredis 1.0.0
Fixes:
- http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...-allow-building-without-a-C-compiler.patch | 57 +++++++++++++++++++
1 file changed, 57 insertions(+)
create mode 100644 package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch
diff --git a/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch b/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch
new file mode 100644
index 0000000000..08a9ef9854
--- /dev/null
+++ b/package/hiredis/0002-CMakeLists.txt-allow-building-without-a-C-compiler.patch
@@ -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
+
--
2.28.0
next reply other threads:[~2020-09-05 10:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 10:59 Fabrice Fontaine [this message]
2020-09-05 21:27 ` [Buildroot] [PATCH 1/1] package/hiredis: fix build without C++ Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200905105913.50960-1-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox