| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 9b4b7f8726171e97f12c587d50e54bab0dc42da5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 12 Sep 2018 22:18:07 -0700 |
| 4 | Subject: [PATCH] Specify --cc, --cxx and --ld variables from environment |
| 5 | |
| 6 | This helps in compiling with non-gcc compilers |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | Makefile.ffmpeg | 22 ++++++++++++++-------- |
| 11 | 1 file changed, 14 insertions(+), 8 deletions(-) |
| 12 | |
| 13 | Index: git/Makefile.ffmpeg |
| 14 | =================================================================== |
| 15 | --- git.orig/Makefile.ffmpeg |
| 16 | +++ git/Makefile.ffmpeg |
| 17 | @@ -22,12 +22,15 @@ configure: |
| 18 | CFLAGS="$(CFLAGS) ${INCLUDES}" \ |
| 19 | LDFLAGS="" \ |
| 20 | ./configure \ |
| 21 | + --ld="${CCLD}" \ |
| 22 | + --cc="${CC}" \ |
| 23 | + --cxx="${CXX}" \ |
| 24 | --extra-cflags="$(FFMPEG_EXTRA_CFLAGS)" \ |
| 25 | --extra-ldflags="$(FFMPEG_EXTRA_LDFLAGS)" \ |
| 26 | --enable-shared \ |
| 27 | --disable-static \ |
| 28 | --arch=arm \ |
| 29 | - --cpu=arm1176jzf-s \ |
| 30 | + --cpu=$(CPU) \ |
| 31 | --target-os=linux \ |
| 32 | --disable-hwaccels \ |
| 33 | --enable-parsers \ |
| 34 | @@ -42,7 +45,7 @@ configure: |
| 35 | --enable-gpl \ |
| 36 | --enable-version3 \ |
| 37 | --enable-protocols \ |
| 38 | - --enable-libsmbclient \ |
| 39 | + --disable-libsmbclient \ |
| 40 | --enable-libssh \ |
| 41 | --enable-nonfree \ |
| 42 | --enable-openssl \ |