diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-05-02 14:57:37 -0400 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-05-06 19:13:31 +0200 |
| commit | cd196a77d4462f8f4ccda251a1514006d885ef90 (patch) | |
| tree | 115722db4f40c75e92032774d58b4fb68afe67f5 /media/ffvpx | |
| parent | e175224b88a94c5c1eb98e6f2636c97365caad8a (diff) | |
| download | UXP-cd196a77d4462f8f4ccda251a1514006d885ef90.tar UXP-cd196a77d4462f8f4ccda251a1514006d885ef90.tar.gz UXP-cd196a77d4462f8f4ccda251a1514006d885ef90.tar.lz UXP-cd196a77d4462f8f4ccda251a1514006d885ef90.tar.xz UXP-cd196a77d4462f8f4ccda251a1514006d885ef90.zip | |
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
Diffstat (limited to 'media/ffvpx')
| -rw-r--r-- | media/ffvpx/libavcodec/moz.build | 5 |
1 files changed, 5 insertions, 0 deletions
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' ] |