1330873 - media/libvpx/libvpx/vp8/common/alloccommon.c:12:24: fatal error: vpx_config.h: No such file or directory

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jan Beich]

Bug 1328744 imposed platform whitelist for x86 and x86_64 which stems from upstream confusing POSIX-like systems with Linux. Let's ignore "mac" and "linux" configs being the same for now. ;)

media/libvpx/libvpx/vp8/common/alloccommon.c:12:10: fatal error: 'vpx_config.h'
      file not found
#include "vpx_config.h"
         ^~~~~~~~~~~~~~
1 error generated.

Comment 1

[Jan Beich]

Attachment: Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms.

Review commit: https://reviewboard.mozilla.org/r/104440/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/104440/

Comment 2

[johannkoenig]

Apologies for the breakage. This patch looks ideal. I should have realized all the *nix configs would fall in the same bucket.

Historically we've broken Mac/Darwin out separately because of compiler/Xcode issues. As you noticed this could be consolidated now.

Comment 3

[Randell Jesup [:jesup] (needinfo me)]

Comment on attachment 8826476 [details]
Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms.

https://reviewboard.mozilla.org/r/104440/#review105328

::: media/libvpx/moz.build:25
(Diff revision 1)
> +    else:
> +        ASFLAGS += [ '-I%s/media/libvpx/config/linux/x64/' % TOPSRCDIR ]

Add a comment along the lines of 
# Linux, Android, BSD, etc

::: media/libvpx/moz.build:37
(Diff revision 1)
> +    else:
> +        ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
> +        CFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]

Ditto

Comment 4

[Randell Jesup [:jesup] (needinfo me)]

Stole the review

Comment 5

[Jan Beich]

Comment on attachment 8826476 [details]
Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/104440/diff/1-2/

Comment 6

[Jan Beich]

Comment on attachment 8826476 [details]
Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms.

https://reviewboard.mozilla.org/r/104440/#review105334

::: media/libvpx/moz.build:25
(Diff revision 2)
>          ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
>          CFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
>      elif CONFIG['OS_TARGET'] == 'Darwin':
>          ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
>          CFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
> +    else: # Android, Linux, BSDs, etc.

This is similar to `#else // Linux` style in C preprocessor. Or did you want the comments on separate lines? If **not** can you mark `checkin-needed` or click on `Automation -> Land Commits` ?

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6d5214fa2276
Fallback to vpx_config.* from Linux on Tier3 platforms. r=jesup

Comment 8

[Ralph Giles (:rillian)]

Comment on attachment 8826476 [details]
Bug 1330873 - Fallback to vpx_config.* from Linux on Tier3 platforms.

https://reviewboard.mozilla.org/r/104440/#review105370

::: media/libvpx/moz.build:25
(Diff revision 2)
>          ASFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
>          CFLAGS += [ '-I%s/media/libvpx/config/win/x64/' % TOPSRCDIR ]
>      elif CONFIG['OS_TARGET'] == 'Darwin':
>          ASFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
>          CFLAGS += [ '-I%s/media/libvpx/config/mac/x64/' % TOPSRCDIR ]
> +    else: # Android, Linux, BSDs, etc.

On the same line is fine I think. Thanks!

Comment 9

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/6d5214fa2276