From 4ecfad8e5340787fedf231e390e181c19b391393 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 2 May 2020 14:57:37 -0400 Subject: Issue #1531 - Work around GCC 10 defaulting to -fno-common in media/ffvpx/libavcodec/ Build Reference: 26:39.53 ../../../build/unix/gold/ld: error: /home/mattatobin/development/.obj/trunk-f1f9fdabf/navigator-x86_64-pc-linux-gnu-gtk2/media/ffvpx/libavcodec/flac_parser.o: multiple definition of 'ff_flac_parser' 26:39.53 ../../../build/unix/gold/ld: /home/mattatobin/development/.obj/trunk-f1f9fdabf/navigator-x86_64-pc-linux-gnu-gtk2/media/ffvpx/libavcodec/dummy_funcs.o: previous definition here 26:39.53 collect2: error: ld returned 1 exit status 26:39.53 gmake[4]: *** [/home/mattatobin/development/binoc-central/platform/config/rules.mk:773: libmozavcodec.so] Error 1 See also: https://gcc.gnu.org/gcc-10/porting_to.html --- media/ffvpx/libavcodec/moz.build | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'media/ffvpx/libavcodec') diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build index 05217a6e4..210ea0ba8 100644 --- a/media/ffvpx/libavcodec/moz.build +++ b/media/ffvpx/libavcodec/moz.build @@ -67,6 +67,11 @@ SOURCES += [ SYMBOLS_FILE = 'avcodec.symbols' NO_VISIBILITY_FLAGS = True +# GCC 10 defaults -fno-common, we don't care to solve this "properly" yet +# so use GCC < 10 behavior. +if CONFIG['GNU_CC'] and CONFIG['CC_VERSION'] >= '10.0.0': + CFLAGS += ['-fcommon'] + USE_LIBS += [ 'mozavutil' ] -- cgit v1.2.3