← Back to branch summary

~mozillateam/firefox/firefox-beta.xenial

« back to all changes in this revision

Viewing changes to debian/patches/fix-armhf-webrtc-build.patch

  • Committer: Rico Tzschichholz
  • Date: 2018-05-25 06:32:20 UTC
  • Revision ID: ricotz@ubuntu.com-20180525063220-pht2tticrz6wzpu7
* Fix the webrtc build on armhf and arm64 by providing build configs rather
  than just disabling it
  - add debian/patches/extra-webrtc-build-configs.patch
  - add debian/patches/update-gn-mozbuild.patch
  - update debian/patches/series
  - update debian/config/mozconfig.in
* Fix multiple definitions of WebRtc_GetCPUFeaturesARM by excluding
  cpu_features_linux.cc, as was the case previously
  - add debian/patches/fix-armhf-webrtc-build.patch
  - update debian/patches/update-gn-mozbuild.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-armhf-webrtc-build.patch
 
1
--- a/media/webrtc/trunk/webrtc/system_wrappers/BUILD.gn
 
2
+++ b/media/webrtc/trunk/webrtc/system_wrappers/BUILD.gn
 
3
@@ -98,9 +98,9 @@
 
4
   if (is_linux) {
 
5
     defines += [ "WEBRTC_THREAD_RR" ]
 
6
 
 
7
-    if (!build_with_chromium) {
 
8
-      deps += [ ":cpu_features_linux" ]
 
9
-    }
 
10
+    #if (!build_with_chromium) {
 
11
+    #  deps += [ ":cpu_features_linux" ]
 
12
+    #}
 
13
 
 
14
     libs += [ "rt" ]
 
15
   }
 
16
--- a/media/webrtc/gn-configs/x64_False_x64_linux.json
 
17
+++ b/media/webrtc/gn-configs/x64_False_x64_linux.json
 
18
@@ -7781,98 +7781,6 @@
 
19
             ],
 
20
             "type": "static_library"
 
21
         },
 
22
-        "//webrtc/system_wrappers:cpu_features_linux": {
 
23
-            "cflags": [
 
24
-                "-fno-strict-aliasing",
 
25
-                "--param=ssp-buffer-size=4",
 
26
-                "-fstack-protector",
 
27
-                "-Wno-builtin-macro-redefined",
 
28
-                "-D__DATE__=",
 
29
-                "-D__TIME__=",
 
30
-                "-D__TIMESTAMP__=",
 
31
-                "-funwind-tables",
 
32
-                "-fPIC",
 
33
-                "-pipe",
 
34
-                "-B../../../../../media/webrtc/trunk/third_party/binutils/Linux_x64/Release/bin",
 
35
-                "-fcolor-diagnostics",
 
36
-                "-m64",
 
37
-                "-march=x86-64",
 
38
-                "-pthread",
 
39
-                "-Wall",
 
40
-                "-Werror",
 
41
-                "-Wextra",
 
42
-                "-Wno-missing-field-initializers",
 
43
-                "-Wno-unused-parameter",
 
44
-                "-Wno-c++11-narrowing",
 
45
-                "-Wno-covered-switch-default",
 
46
-                "-Wno-unneeded-internal-declaration",
 
47
-                "-Wno-inconsistent-missing-override",
 
48
-                "-Wno-undefined-var-template",
 
49
-                "-Wno-nonportable-include-path",
 
50
-                "-Wno-address-of-packed-member",
 
51
-                "-Wno-unused-lambda-capture",
 
52
-                "-Wno-user-defined-warnings",
 
53
-                "-O2",
 
54
-                "-fno-ident",
 
55
-                "-fdata-sections",
 
56
-                "-ffunction-sections",
 
57
-                "-fomit-frame-pointer",
 
58
-                "-g0",
 
59
-                "-fvisibility=hidden",
 
60
-                "-Xclang",
 
61
-                "-load",
 
62
-                "-Xclang",
 
63
-                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
 
64
-                "-Xclang",
 
65
-                "-add-plugin",
 
66
-                "-Xclang",
 
67
-                "find-bad-constructs",
 
68
-                "-Xclang",
 
69
-                "-plugin-arg-find-bad-constructs",
 
70
-                "-Xclang",
 
71
-                "check-auto-raw-pointer",
 
72
-                "-Xclang",
 
73
-                "-plugin-arg-find-bad-constructs",
 
74
-                "-Xclang",
 
75
-                "check-ipc",
 
76
-                "-Wheader-hygiene",
 
77
-                "-Wstring-conversion",
 
78
-                "-Wtautological-overlap-compare",
 
79
-                "-Wextra",
 
80
-                "-Wno-unused-parameter",
 
81
-                "-Wno-missing-field-initializers",
 
82
-                "-Wno-strict-overflow",
 
83
-                "-Wimplicit-fallthrough",
 
84
-                "-Wthread-safety",
 
85
-                "-Winconsistent-missing-override",
 
86
-                "-Wundef"
 
87
-            ],
 
88
-            "defines": [
 
89
-                "V8_DEPRECATION_WARNINGS",
 
90
-                "USE_NSS_CERTS=1",
 
91
-                "USE_X11=1",
 
92
-                "CHROMIUM_BUILD",
 
93
-                "_FILE_OFFSET_BITS=64",
 
94
-                "NDEBUG",
 
95
-                "NVALGRIND",
 
96
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
 
97
-                "WEBRTC_RESTRICT_LOGGING",
 
98
-                "EXPAT_RELATIVE_PATH",
 
99
-                "WEBRTC_MOZILLA_BUILD",
 
100
-                "WEBRTC_POSIX",
 
101
-                "WEBRTC_LINUX"
 
102
-            ],
 
103
-            "deps": [],
 
104
-            "include_dirs": [
 
105
-                "//",
 
106
-                "/home/dminor/src/firefox-signaling/obj-x86_64-pc-linux-gnu/media/webrtc/trunk/gn-output/gen/"
 
107
-            ],
 
108
-            "libs": [],
 
109
-            "sources": [
 
110
-                "//webrtc/system_wrappers/source/cpu_features_linux.c"
 
111
-            ],
 
112
-            "type": "static_library"
 
113
-        },
 
114
         "//webrtc/system_wrappers:field_trial_default": {
 
115
             "cflags": [
 
116
                 "-fno-strict-aliasing",
 
117
@@ -8143,8 +8051,7 @@
 
118
             ],
 
119
             "deps": [
 
120
                 "//webrtc:webrtc_common",
 
121
-                "//webrtc/base:rtc_base_approved",
 
122
-                "//webrtc/system_wrappers:cpu_features_linux"
 
123
+                "//webrtc/base:rtc_base_approved"
 
124
             ],
 
125
             "include_dirs": [
 
126
                 "//",
 
127
@@ -9191,4 +9098,4 @@
 
128
             "type": "static_library"
 
129
         }
 
130
     }
 
131
-}
 
132
\ No newline at end of file
 
133
+}
 
134
--- a/media/webrtc/gn-configs/x86_False_x86_linux.json
 
135
+++ b/media/webrtc/gn-configs/x86_False_x86_linux.json
 
136
@@ -7781,98 +7781,6 @@
 
137
             ],
 
138
             "type": "static_library"
 
139
         },
 
140
-        "//webrtc/system_wrappers:cpu_features_linux": {
 
141
-            "cflags": [
 
142
-                "-fno-strict-aliasing",
 
143
-                "--param=ssp-buffer-size=4",
 
144
-                "-fstack-protector",
 
145
-                "-Wno-builtin-macro-redefined",
 
146
-                "-D__DATE__=",
 
147
-                "-D__TIME__=",
 
148
-                "-D__TIMESTAMP__=",
 
149
-                "-funwind-tables",
 
150
-                "-fPIC",
 
151
-                "-pipe",
 
152
-                "-B../../../../../media/webrtc/trunk/third_party/binutils/Linux_x64/Release/bin",
 
153
-                "-fcolor-diagnostics",
 
154
-                "-m64",
 
155
-                "-march=x86-64",
 
156
-                "-pthread",
 
157
-                "-Wall",
 
158
-                "-Werror",
 
159
-                "-Wextra",
 
160
-                "-Wno-missing-field-initializers",
 
161
-                "-Wno-unused-parameter",
 
162
-                "-Wno-c++11-narrowing",
 
163
-                "-Wno-covered-switch-default",
 
164
-                "-Wno-unneeded-internal-declaration",
 
165
-                "-Wno-inconsistent-missing-override",
 
166
-                "-Wno-undefined-var-template",
 
167
-                "-Wno-nonportable-include-path",
 
168
-                "-Wno-address-of-packed-member",
 
169
-                "-Wno-unused-lambda-capture",
 
170
-                "-Wno-user-defined-warnings",
 
171
-                "-O2",
 
172
-                "-fno-ident",
 
173
-                "-fdata-sections",
 
174
-                "-ffunction-sections",
 
175
-                "-fomit-frame-pointer",
 
176
-                "-g0",
 
177
-                "-fvisibility=hidden",
 
178
-                "-Xclang",
 
179
-                "-load",
 
180
-                "-Xclang",
 
181
-                "../../../../../media/webrtc/trunk/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
 
182
-                "-Xclang",
 
183
-                "-add-plugin",
 
184
-                "-Xclang",
 
185
-                "find-bad-constructs",
 
186
-                "-Xclang",
 
187
-                "-plugin-arg-find-bad-constructs",
 
188
-                "-Xclang",
 
189
-                "check-auto-raw-pointer",
 
190
-                "-Xclang",
 
191
-                "-plugin-arg-find-bad-constructs",
 
192
-                "-Xclang",
 
193
-                "check-ipc",
 
194
-                "-Wheader-hygiene",
 
195
-                "-Wstring-conversion",
 
196
-                "-Wtautological-overlap-compare",
 
197
-                "-Wextra",
 
198
-                "-Wno-unused-parameter",
 
199
-                "-Wno-missing-field-initializers",
 
200
-                "-Wno-strict-overflow",
 
201
-                "-Wimplicit-fallthrough",
 
202
-                "-Wthread-safety",
 
203
-                "-Winconsistent-missing-override",
 
204
-                "-Wundef"
 
205
-            ],
 
206
-            "defines": [
 
207
-                "V8_DEPRECATION_WARNINGS",
 
208
-                "USE_NSS_CERTS=1",
 
209
-                "USE_X11=1",
 
210
-                "CHROMIUM_BUILD",
 
211
-                "_FILE_OFFSET_BITS=64",
 
212
-                "NDEBUG",
 
213
-                "NVALGRIND",
 
214
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
 
215
-                "WEBRTC_RESTRICT_LOGGING",
 
216
-                "EXPAT_RELATIVE_PATH",
 
217
-                "WEBRTC_MOZILLA_BUILD",
 
218
-                "WEBRTC_POSIX",
 
219
-                "WEBRTC_LINUX"
 
220
-            ],
 
221
-            "deps": [],
 
222
-            "include_dirs": [
 
223
-                "//",
 
224
-                "/home/dminor/src/firefox-signaling/obj-x86_64-pc-linux-gnu/media/webrtc/trunk/gn-output/gen/"
 
225
-            ],
 
226
-            "libs": [],
 
227
-            "sources": [
 
228
-                "//webrtc/system_wrappers/source/cpu_features_linux.c"
 
229
-            ],
 
230
-            "type": "static_library"
 
231
-        },
 
232
         "//webrtc/system_wrappers:field_trial_default": {
 
233
             "cflags": [
 
234
                 "-fno-strict-aliasing",
 
235
@@ -8143,8 +8051,7 @@
 
236
             ],
 
237
             "deps": [
 
238
                 "//webrtc:webrtc_common",
 
239
-                "//webrtc/base:rtc_base_approved",
 
240
-                "//webrtc/system_wrappers:cpu_features_linux"
 
241
+                "//webrtc/base:rtc_base_approved"
 
242
             ],
 
243
             "include_dirs": [
 
244
                 "//",