]> granicus.if.org Git - handbrake/commitdiff
contrib: Explicitly pass arch to FFmpeg on macOS x86_64.
authorBradley Sepos <bradley@bradleysepos.com>
Fri, 1 Jun 2018 20:13:55 +0000 (16:13 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Fri, 1 Jun 2018 20:17:14 +0000 (16:17 -0400)
Fixes FFmpeg configure error on macOS:

```
./configure: line 588: eval: --: invalid option
eval: usage: eval [arg ...]
make[1]: *** [contrib/ffmpeg/.stamp.ffmpeg.configure] Error 2
```

...caused by attempting to `eval --arch=x86_64=yes`.

contrib/ffmpeg/module.defs

index c8d729ff7870e467fb6696b14392ab57938f6ed2..36d04b2db7fa496471e1115cdeb94c8c170b56f1 100644 (file)
@@ -73,6 +73,9 @@ FFMPEG.CONFIGURE.extra += \
 
 ifeq (darwin,$(BUILD.system))
     FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage --disable-videotoolbox
+    ifeq (x86_64,$(BUILD.arch))
+        FFMPEG.CONFIGURE.extra += --arch=x86_64
+    endif
 endif
 
 ## check against tuple: B-SYSTEM where B is { 0 | 1 } for cross-compiling flag