| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From f570b9985ff2d57d21c1e64ed08c43b6d89fd0b1 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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> |
| Patrick Williams | 864cc43 | 2023-02-09 14:54:44 -0600 | [diff] [blame^] | 10 | Upstream-Status: Pending |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 11 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 12 | --- |
| 13 | Makefile.ffmpeg | 4 ++-- |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 15 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 16 | Index: git/Makefile.ffmpeg |
| 17 | =================================================================== |
| 18 | --- git.orig/Makefile.ffmpeg |
| 19 | +++ git/Makefile.ffmpeg |
| 20 | @@ -5,7 +5,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-a |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 21 | WORK=$(PWD) |
| 22 | |
| 23 | .PHONY : all |
| 24 | -all: configure compile |
| 25 | +all: compile |
| 26 | |
| 27 | .PHONY : copy |
| 28 | copy: |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | @@ -13,7 +13,7 @@ copy: |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 30 | $(HOST)-strip *.so* |
| 31 | |
| 32 | .PHONY : compile |
| 33 | -compile: |
| 34 | +compile: configure |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 35 | +$(MAKE) -j$(shell nproc) -C ffmpeg |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 36 | |
| 37 | .PHONY : configure |