electron/patches/common/ffmpeg/fix_build_on_linux_x86.patch

diff --git a/BUILD.gn b/BUILD.gn
index 494d33fc04..249f3700f3 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -239,7 +239,7 @@ target(link_target_type, "ffmpeg_internal") {
   # Windows builds can't compile without EBP because we can't omit frame
   # pointers like we do on posix.
   if (target_cpu == "x86") {
-    if (using_sanitizer || is_win) {
+    if (using_sanitizer || is_win || is_electron_build) {
       defines += [ "HAVE_EBP_AVAILABLE=0" ]
     } else {
       defines += [ "HAVE_EBP_AVAILABLE=1" ]
build: move libcc patches to electron repo (#14104) In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived. 2018-09-14 05:02:16 +00:00			`diff --git a/BUILD.gn b/BUILD.gn`
update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches 2018-09-14 18:03:43 +00:00			`index 494d33fc04..249f3700f3 100755`
build: move libcc patches to electron repo (#14104) In the GN build, libchromiumcontent is no longer a distinct library, but merely a container for a set of scripts and patches. Maintaining those patches in a separate repository is tedious and error-prone, so merge them into the main repo. Once this is merged and GN is the default way to build Electron, the libchromiumcontent repository can be archived. 2018-09-14 05:02:16 +00:00			`--- a/BUILD.gn`
			`+++ b/BUILD.gn`
update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches 2018-09-14 18:03:43 +00:00			`@@ -239,7 +239,7 @@ target(link_target_type, "ffmpeg_internal") {`
			`# Windows builds can't compile without EBP because we can't omit frame`
			`# pointers like we do on posix.`
			`if (target_cpu == "x86") {`
			`- if (using_sanitizer \|\| is_win) {`
			`+ if (using_sanitizer \|\| is_win \|\| is_electron_build) {`
			`defines += [ "HAVE_EBP_AVAILABLE=0" ]`
			`} else {`
			`defines += [ "HAVE_EBP_AVAILABLE=1" ]`