36b2d9ab0c
[Thomas:
- Do not define QPID_PROTON_VERSION_MAJOR, and use proto-* instead,
as suggested by Arnout.
- Use QPID_PROTO_VERSION in QPID_PROTON_SITE, as suggested by
Arnout
- Remove useless comma in the openssl test, as suggested by Arnout
- Change the post install target hook to remove the
/usr/share/proton-*/ directory entirely, and not just the
examples, since it only contains some license and documentation
files.]
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
From f24be9ae9ab01c7507a366e9d5529c444f0b7edd Mon Sep 17 00:00:00 2001
|
|
From: Luca Ceresoli <luca@lucaceresoli.net>
|
|
Date: Fri, 10 Jul 2015 10:13:47 +0200
|
|
Subject: [PATCH] proton-c: fix C compiler detection with _ARG1/_ARG2
|
|
|
|
The C compiler commandline in CMake is composed by the concatenation of
|
|
CMAKE_C_COMPILER + CMAKE_C_COMPILER_ARG1 + CMAKE_C_COMPILER_ARG2.
|
|
|
|
In most use cases the two additional argument variables are empty, thus
|
|
CMAKE_C_COMPILER can be used without any noticeable difference.
|
|
|
|
The Buildroot embedded Linux build system [0], however, optionally exploits the
|
|
CMAKE_C_COMPILER_ARG1 variable to speed up the cross-compilation of CMake-based
|
|
packages using ccache. It does so by setting [1]:
|
|
|
|
CMAKE_C_COMPILER = /path/to/ccache
|
|
CMAKE_C_COMPILER_ARG1 = /path/to/cross-gcc
|
|
|
|
This works fine with other CMake-based packages, but proton-c's CMakeLists.txt
|
|
calls gcc to extract the compiler version. It does so by calling
|
|
"${CMAKE_C_COMPILER} -dumpversion", without honoring the two extra arguments.
|
|
Within Buildroot with ccache enabled, this means calling
|
|
"/path/to/ccache -dumpversion", which fails with the error:
|
|
|
|
ccache: invalid option -- 'd'
|
|
|
|
Fix the compiler check by adding the two arguments.
|
|
|
|
[0] http://buildroot.net/
|
|
[1] http://git.buildroot.net/buildroot/tree/support/misc/toolchainfile.cmake.in?id=2015.05
|
|
|
|
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
|
|
---
|
|
proton-c/CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
|
|
index 93449a9..8c31a89 100644
|
|
--- a/proton-c/CMakeLists.txt
|
|
+++ b/proton-c/CMakeLists.txt
|
|
@@ -218,7 +218,7 @@ if (CMAKE_COMPILER_IS_GNUCC)
|
|
set (COMPILE_LANGUAGE_FLAGS "-std=c99")
|
|
set (COMPILE_PLATFORM_FLAGS "-std=gnu99")
|
|
|
|
- execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION
|
|
+ execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${CMAKE_C_COMPILER_ARG2} -dumpversion OUTPUT_VARIABLE GCC_VERSION
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
if (${GCC_VERSION} VERSION_LESS "4.3.0")
|
|
# Only a concern if contibuting code back.
|
|
--
|
|
1.9.1
|
|
|