KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
openwrtv4/tools/ccache/patches/100-honour-copts.patch

13 lines
367 B
Diff
Raw Normal View History

ccache: Make ccache aware of OpenWRT provided GCC patch. The OpenWRT GCC patch, 910-mbsd_multi.patch adds an extra option to gcc that depends on an environment variable. Standard ccache is unaware of this option and therefor can produce stdout from gcc that doesn't correspond to what you would get if you actually do a direct compilation with gcc. This commit adds a patch to ccache to make it aware of the new option and removes the feature from the ccache package to use the host system's installed ccache binary. Signed-off-by: Karl Vogel <karl.vogel@gmail.com> SVN-Revision: 46364
2015-07-14 10:30:38 +00:00
diff --git a/ccache.c b/ccache.c
tools/ccache: Update ccache 3.3.2 and refresh patch Update ccache 3.3.2 and refresh patch Preserving the original patch comments here by Karl Vogel: "From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel@gmail.com> Date: Tue, 14 Jul 2015 11:05:33 +0200 Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash. The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra compilation flag, -fhonour-copts, which is influenced by an environment variable called GCC_HONOUR_COPTS. Include this environment var in the hash calculation as otherwise the gcc stdout warning from a previous compilation might be shown where, even when GCC_HONOUR_COPTS is in 's'ilent mode. Signed-off-by: Karl Vogel <karl.vogel@gmail.com>" Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2016-10-02 20:44:06 +00:00
index 88e0ec5..7dffeb4 100644
ccache: Make ccache aware of OpenWRT provided GCC patch. The OpenWRT GCC patch, 910-mbsd_multi.patch adds an extra option to gcc that depends on an environment variable. Standard ccache is unaware of this option and therefor can produce stdout from gcc that doesn't correspond to what you would get if you actually do a direct compilation with gcc. This commit adds a patch to ccache to make it aware of the new option and removes the feature from the ccache package to use the host system's installed ccache binary. Signed-off-by: Karl Vogel <karl.vogel@gmail.com> SVN-Revision: 46364
2015-07-14 10:30:38 +00:00
--- a/ccache.c
+++ b/ccache.c
tools/ccache: Update ccache 3.3.2 and refresh patch Update ccache 3.3.2 and refresh patch Preserving the original patch comments here by Karl Vogel: "From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel@gmail.com> Date: Tue, 14 Jul 2015 11:05:33 +0200 Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash. The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra compilation flag, -fhonour-copts, which is influenced by an environment variable called GCC_HONOUR_COPTS. Include this environment var in the hash calculation as otherwise the gcc stdout warning from a previous compilation might be shown where, even when GCC_HONOUR_COPTS is in 's'ilent mode. Signed-off-by: Karl Vogel <karl.vogel@gmail.com>" Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2016-10-02 20:44:06 +00:00
@@ -1762,6 +1762,7 @@ calculate_object_hash(struct args *args, struct mdfour *hash, int direct_mode)
ccache: Make ccache aware of OpenWRT provided GCC patch. The OpenWRT GCC patch, 910-mbsd_multi.patch adds an extra option to gcc that depends on an environment variable. Standard ccache is unaware of this option and therefor can produce stdout from gcc that doesn't correspond to what you would get if you actually do a direct compilation with gcc. This commit adds a patch to ccache to make it aware of the new option and removes the feature from the ccache package to use the host system's installed ccache binary. Signed-off-by: Karl Vogel <karl.vogel@gmail.com> SVN-Revision: 46364
2015-07-14 10:30:38 +00:00
"CPLUS_INCLUDE_PATH",
"OBJC_INCLUDE_PATH",
tools/ccache: Update ccache 3.3.2 and refresh patch Update ccache 3.3.2 and refresh patch Preserving the original patch comments here by Karl Vogel: "From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel@gmail.com> Date: Tue, 14 Jul 2015 11:05:33 +0200 Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash. The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra compilation flag, -fhonour-copts, which is influenced by an environment variable called GCC_HONOUR_COPTS. Include this environment var in the hash calculation as otherwise the gcc stdout warning from a previous compilation might be shown where, even when GCC_HONOUR_COPTS is in 's'ilent mode. Signed-off-by: Karl Vogel <karl.vogel@gmail.com>" Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2016-10-02 20:44:06 +00:00
"OBJCPLUS_INCLUDE_PATH", // clang
ccache: Make ccache aware of OpenWRT provided GCC patch. The OpenWRT GCC patch, 910-mbsd_multi.patch adds an extra option to gcc that depends on an environment variable. Standard ccache is unaware of this option and therefor can produce stdout from gcc that doesn't correspond to what you would get if you actually do a direct compilation with gcc. This commit adds a patch to ccache to make it aware of the new option and removes the feature from the ccache package to use the host system's installed ccache binary. Signed-off-by: Karl Vogel <karl.vogel@gmail.com> SVN-Revision: 46364
2015-07-14 10:30:38 +00:00
+ "GCC_HONOUR_COPTS",
NULL
};
tools/ccache: Update ccache 3.3.2 and refresh patch Update ccache 3.3.2 and refresh patch Preserving the original patch comments here by Karl Vogel: "From 90762a9b8d9a50b6176f10bd6c2e2b9501117561 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel@gmail.com> Date: Tue, 14 Jul 2015 11:05:33 +0200 Subject: [PATCH] Include environment variable GCC_HONOUR_COPTS in hash. The OpenWRT patch, 910-mbsd_multi.patch, to GCC adds an extra compilation flag, -fhonour-copts, which is influenced by an environment variable called GCC_HONOUR_COPTS. Include this environment var in the hash calculation as otherwise the gcc stdout warning from a previous compilation might be shown where, even when GCC_HONOUR_COPTS is in 's'ilent mode. Signed-off-by: Karl Vogel <karl.vogel@gmail.com>" Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2016-10-02 20:44:06 +00:00
for (const char **p = envvars; *p; ++p) {
Reference in a new issue Copy permalink