chromium: split patch 'Remove hard coded values for CC and CXX'
PATCH 1/2 chromium: split patch 'Remove hard coded values for CC and CXX'
From: Jacobo Aragunde Pérez <[email protected]>
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 to be used by chromium recipe.
Signed-off-by Jacobo Aragunde Pérez <[email protected]>
Signed-off-by Otavio Salvador <[email protected]>
--- .../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
recipes-browser/chromium/chromium-wayland_53.0.2785.143.bb +1 -1
@@ -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 \
recipes-browser/chromium/chromium/chromium-wayland/Remove-hard-coded-values-for-CC-and-CXX.patch new file +42 -0
42 lines not on this page · raw message
recipes-browser/chromium/files/0003-Remove-hard-coded-values-for-CC-and-CXX.patch +6 -5
@@ -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 +
Signature · 1 line
2.10.2