Chromium and chromium-wayland recipes cannot share this patch any more due to diverging code bases. We create a new version of the patch only for chromium-wayland and revert the existing patch to its previous state.
Signed-off-by: Jacobo Aragunde Pérez <jaragu...@igalia.com> --- .../chromium/chromium-wayland_53.0.2785.143.bb | 2 +- .../Remove-hard-coded-values-for-CC-and-CXX.patch | 42 ++++++++++++++++++++++ ...3-Remove-hard-coded-values-for-CC-and-CXX.patch | 11 +++--- 3 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 recipes-browser/chromium/chromium/chromium-wayland/Remove-hard-coded-values-for-CC-and-CXX.patch diff --git a/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bb b/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bb index c8aea27..a75918b 100644 --- a/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bb +++ b/recipes-browser/chromium/chromium-wayland_53.0.2785.143.bb @@ -6,9 +6,9 @@ DEPENDS += "wayland libxkbcommon" SRC_URI += "\ file://chromium-wayland/add_missing_stat_h_include.patch \ - file://0003-Remove-hard-coded-values-for-CC-and-CXX.patch \ file://0004-Create-empty-i18n_process_css_test.html-file-to-avoi.patch \ file://0005-Override-root-filesystem-access-restriction.patch \ + file://chromium-wayland/Remove-hard-coded-values-for-CC-and-CXX.patch \ file://chromium-wayland/0007-Workaround-for-glib-related-build-error-with-ozone-w.patch \ file://chromium-wayland/0011-Replace-readdir_r-with-readdir.patch \ file://chromium-wayland/remove-Werror.patch \ diff --git a/recipes-browser/chromium/chromium/chromium-wayland/Remove-hard-coded-values-for-CC-and-CXX.patch b/recipes-browser/chromium/chromium/chromium-wayland/Remove-hard-coded-values-for-CC-and-CXX.patch new file mode 100644 index 0000000..63de68a --- /dev/null +++ b/recipes-browser/chromium/chromium/chromium-wayland/Remove-hard-coded-values-for-CC-and-CXX.patch @@ -0,0 +1,42 @@ +From 518135b0cd6878e91e5fcf489f3185740ec307c0 Mon Sep 17 00:00:00 2001 +From: Carlos Rafael Giani <d...@pseudoterminal.org> +Date: Sun, 12 Oct 2014 19:31:47 +0200 +Subject: [PATCH] Remove hard coded values for CC and CXX + +In spite of what the comment says, the environment variables do *not* +override the variables; "which which arm-linux-gnueabihf-gcc" etc. are +always called. To undo this, remove the change. + +Upstream-Status: Pending + +The default values cannot be overriden without the patch; upstream +might be interested in this. + +Signed-off-by: Carlos Rafael Giani <d...@pseudoterminal.org> +--- + build/common.gypi | 10 ---------- + 1 file changed, 10 deletions(-) + +diff --git a/build/common.gypi b/build/common.gypi +index 7ec5ae2..11e8d1d 100644 +--- a/build/common.gypi ++++ b/build/common.gypi +@@ -6027,16 +6027,6 @@ + ['CXX.host', '<(host_cxx)'], + ], + }], +- ['OS=="linux" and target_arch=="arm" and host_arch!="arm" and chromeos==0 and clang==0', { +- # Set default ARM cross tools on linux. These can be overridden +- # using CC,CXX,CC.host and CXX.host environment variables. +- 'make_global_settings': [ +- ['CC', '<!(which arm-linux-gnueabihf-gcc)'], +- ['CXX', '<!(which arm-linux-gnueabihf-g++)'], +- ['CC.host', '<(host_cc)'], +- ['CXX.host', '<(host_cxx)'], +- ], +- }], + ['use_goma==1', { + 'make_global_settings': [ + ['CC_wrapper', '<(gomadir)/gomacc'], +-- +2.1.4 diff --git a/recipes-browser/chromium/files/0003-Remove-hard-coded-values-for-CC-and-CXX.patch b/recipes-browser/chromium/files/0003-Remove-hard-coded-values-for-CC-and-CXX.patch index 63de68a..7bc8d14 100644 --- a/recipes-browser/chromium/files/0003-Remove-hard-coded-values-for-CC-and-CXX.patch +++ b/recipes-browser/chromium/files/0003-Remove-hard-coded-values-for-CC-and-CXX.patch @@ -21,7 +21,7 @@ diff --git a/build/common.gypi b/build/common.gypi index 7ec5ae2..11e8d1d 100644 --- a/build/common.gypi +++ b/build/common.gypi -@@ -6027,16 +6027,6 @@ +@@ -6047,16 +6047,6 @@ ['CXX.host', '<(host_cxx)'], ], }], @@ -35,8 +35,9 @@ index 7ec5ae2..11e8d1d 100644 - ['CXX.host', '<(host_cxx)'], - ], - }], - ['use_goma==1', { - 'make_global_settings': [ - ['CC_wrapper', '<(gomadir)/gomacc'], + # TODO(yyanagisawa): supports GENERATOR==make + # make generator doesn't support CC_wrapper without CC + # in make_global_settings yet. -- -2.1.4 +1.9.1 + -- 2.7.4 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel