From: Romain Naour <romain.naour@openwide.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 15/19] qpid-proton: remove now-redundant ccache handling patch
Date: Sun, 4 Oct 2015 11:44:47 +0200 [thread overview]
Message-ID: <5610F50F.2060806@openwide.fr> (raw)
In-Reply-To: <1442777319-24164-2-git-send-email-arnout@mind.be>
Arnout,
Le 20/09/2015 21:28, Arnout Vandecappelle (Essensium/Mind) a ?crit :
> Although this patch is still relevant for upstream, we don't need it
> anymore in buildoort because we no longer have _ARG1.
>
> Note that it would be relevant again if we would add host-qpid-proton.
> However, the 0.10 release already has the fix.
>
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Romain Naour <romain.naour@openwide.fr>
Best regards,
Romain
> ---
> ...fix-C-compiler-detection-with-_ARG1-_ARG2.patch | 52 ----------------------
> 1 file changed, 52 deletions(-)
> delete mode 100644 package/qpid-proton/0001-proton-c-fix-C-compiler-detection-with-_ARG1-_ARG2.patch
>
> diff --git a/package/qpid-proton/0001-proton-c-fix-C-compiler-detection-with-_ARG1-_ARG2.patch b/package/qpid-proton/0001-proton-c-fix-C-compiler-detection-with-_ARG1-_ARG2.patch
> deleted file mode 100644
> index 16f4aba..0000000
> --- a/package/qpid-proton/0001-proton-c-fix-C-compiler-detection-with-_ARG1-_ARG2.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -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
> -
>
next prev parent reply other threads:[~2015-10-04 9:44 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-20 18:41 [Buildroot] Internal toolchain wrapper & ccache fixes Arnout Vandecappelle
2015-09-20 18:41 ` [Buildroot] [PATCH 01/18] toolchain-external: move wrapper to toolchain directory Arnout Vandecappelle
2015-10-03 18:45 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 02/18] gcc: use toolchain wrapper Arnout Vandecappelle
2015-10-03 19:42 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 03/18] gcc: remove unsafe patch check (poison system dirs) patch Arnout Vandecappelle
2015-10-03 19:47 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 04/18] infra: move ccache handling to the toolchain wrapper Arnout Vandecappelle
2015-10-03 21:02 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 05/18] perl: Remove ccache handling Arnout Vandecappelle
2015-10-03 21:07 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 06/18] imx-lib: remove now-redundant " Arnout Vandecappelle
2015-10-03 21:11 ` Romain Naour
2015-10-03 21:16 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 07/18] imx-vpu: " Arnout Vandecappelle
2015-10-03 21:22 ` Romain Naour
2015-09-20 18:41 ` [Buildroot] [PATCH 08/18] linux: " Arnout Vandecappelle
2015-10-03 21:23 ` Romain Naour
2015-09-20 19:23 ` [Buildroot] [PATCH 09/18] uboot: " Arnout Vandecappelle
2015-09-20 19:23 ` [Buildroot] [PATCH 10/18] barebox: " Arnout Vandecappelle
2015-10-03 21:25 ` Romain Naour
2015-09-20 19:23 ` [Buildroot] [PATCH 11/18] cryptodev-linux: remove now-redundant fix-ccache-compile patch Arnout Vandecappelle
2015-10-03 21:34 ` Romain Naour
2015-09-20 19:23 ` [Buildroot] [PATCH 12/18] qt5base: remove now-redundant ccache handling Arnout Vandecappelle
2015-10-03 21:43 ` Romain Naour
2015-09-20 19:23 ` [Buildroot] [PATCH 13/18] package-cmake: remove now-redundant target ccache support Arnout Vandecappelle
2015-10-04 9:32 ` Romain Naour
2015-10-03 21:24 ` [Buildroot] [PATCH 09/18] uboot: remove now-redundant ccache handling Romain Naour
2015-09-20 19:28 ` [Buildroot] [PATCH 14/19] package-cmake: remove now-redundant target ccache support Arnout Vandecappelle
2015-09-20 19:28 ` [Buildroot] [PATCH 15/19] qpid-proton: remove now-redundant ccache handling patch Arnout Vandecappelle
2015-10-04 9:44 ` Romain Naour [this message]
2015-09-20 19:28 ` [Buildroot] [PATCH 16/19] Makefile.in: remove now-unused TARGET_CC/CXX_NOCCACHE Arnout Vandecappelle
2015-10-04 9:48 ` Romain Naour
2015-09-20 19:28 ` [Buildroot] [PATCH 17/19] [RFC] toolchain-wrapper: support change of BR2_CCACHE Arnout Vandecappelle
2015-10-04 10:13 ` Romain Naour
2015-09-20 19:28 ` [Buildroot] [PATCH 18/19] ccache: use mtime for external toolchain, CONF_OPTS for internal toolchain Arnout Vandecappelle
2015-09-21 21:43 ` Samuel Martin
2015-09-21 22:32 ` Arnout Vandecappelle
2015-09-22 19:25 ` Samuel Martin
2015-09-20 19:28 ` [Buildroot] [PATCH 19/19] [RFC] ccache: support changing the output directory Arnout Vandecappelle
2015-09-20 19:32 ` [Buildroot] [PATCH 14/19] package-cmake: remove now-redundant target ccache support Arnout Vandecappelle
2015-10-03 21:49 ` Romain Naour
2015-09-21 21:43 ` [Buildroot] Internal toolchain wrapper & ccache fixes Samuel Martin
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=5610F50F.2060806@openwide.fr \
--to=romain.naour@openwide.fr \
--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