| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame^] | 1 | From 4a13419e3805b541fc58e57f1f27c4a388609ef5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Paul Barker <pbarker@toganlabs.com> |
| 3 | Date: Thu, 7 Sep 2017 20:02:15 +0000 |
| 4 | Subject: [PATCH] Prevent ffmpeg configure/compile race condition |
| 5 | |
| 6 | Additional dependency information is needed in Makefile.ffmpeg to ensure that |
| 7 | the configure stage is finished before the compile stage starts. |
| 8 | |
| 9 | Signed-off-by: Paul Barker <pbarker@toganlabs.com> |
| 10 | Upstream-status: Pending |
| 11 | --- |
| 12 | Makefile.ffmpeg | 4 ++-- |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg |
| 16 | index 8651724..619c49a 100644 |
| 17 | --- a/Makefile.ffmpeg |
| 18 | +++ b/Makefile.ffmpeg |
| 19 | @@ -6,7 +6,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstru |
| 20 | WORK=$(PWD) |
| 21 | |
| 22 | .PHONY : all |
| 23 | -all: configure compile |
| 24 | +all: compile |
| 25 | |
| 26 | .PHONY : copy |
| 27 | copy: |
| 28 | @@ -14,7 +14,7 @@ copy: |
| 29 | $(HOST)-strip *.so* |
| 30 | |
| 31 | .PHONY : compile |
| 32 | -compile: |
| 33 | +compile: configure |
| 34 | +$(MAKE) -C ffmpeg |
| 35 | |
| 36 | .PHONY : configure |
| 37 | -- |
| 38 | 2.7.4 |
| 39 | |