1253775 - Remove libmar and libbz2 Makefile.ins

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Michael Shal [:mshal]]

Most of these just have a .NOTPARALLEL line, which was added in bug 400840. I don't believe this is relevant for our current set of supported compilers. Even if it was, the host and target files are now different since the target files are built with UNIFIED_SOURCES, so the preprocessed and object file names should be different.

The tests Makefile can hopefully just be moved to TEST_HARNESS_FILES.

Comment 1

[Mike Hommey [:glandium]]

Same applies to modules/libbz2/src/Makefile.in

Comment 2

[Michael Shal [:mshal]]

Attachment: MozReview Request: Bug 1253775 - Remove libmar and libbz2 Makefile.ins; r?ted

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

Comment 3

[Michael Shal [:mshal]]

Note that I didn't carry over the ifndef MOZ_PROFILE_GENERATE - I don't think there's a way to check for this in moz.build. I'm not sure if this causes problems or not, but PGO does seem to build fine on try:

https://treeherder.mozilla.org/#/jobs?repo=try&revision=396530b02b53

Comment 4

[(not currently active) Ted Mielczarek]

(In reply to Michael Shal [:mshal] from comment #3)
> Note that I didn't carry over the ifndef MOZ_PROFILE_GENERATE - I don't
> think there's a way to check for this in moz.build. I'm not sure if this
> causes problems or not, but PGO does seem to build fine on try:

I don't know why that's there, but it does seem like it wouldn't be harmful to copy the files in the MOZ_PROFILE_GENERATE case. They'll just get overwritten during the MOZ_PROFILE_USE phase of the build anyway.

Comment 5

[(not currently active) Ted Mielczarek]

Comment on attachment 8729117 [details]
MozReview Request: Bug 1253775 - Remove libmar and libbz2 Makefile.ins; r?ted

https://reviewboard.mozilla.org/r/39251/#review36199

::: modules/libmar/tests/moz.build:11
(Diff revision 1)
>  
>  XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
>  
>  DEFINES['BIN_SUFFIX'] = CONFIG['BIN_SUFFIX']
> +
> +if CONFIG['OS_TARGET'] != 'Android':

This whole thing sure is gross! Not your fault, though.

::: modules/libmar/tests/moz.build:24
(Diff revision 1)
> +        ])
> +    TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted(
> +        ['!/dist/bin/%s%s%s' % (
> +            CONFIG['DLL_PREFIX'],
> +            name,
> +            CONFIG['DLL_SUFFIX'],

This happens just often enough that I wonder if we shouldn't ought to expose a helper function in moz.build like `shared_lib_name(name)`.

Comment 6

[Michael Shal [:mshal]]

(In reply to Ted Mielczarek [:ted.mielczarek] from comment #5)
> ::: modules/libmar/tests/moz.build:24
> (Diff revision 1)
> > +        ])
> > +    TEST_HARNESS_FILES.xpcshell.modules.libmar.tests.unit += sorted(
> > +        ['!/dist/bin/%s%s%s' % (
> > +            CONFIG['DLL_PREFIX'],
> > +            name,
> > +            CONFIG['DLL_SUFFIX'],
> 
> This happens just often enough that I wonder if we shouldn't ought to expose
> a helper function in moz.build like `shared_lib_name(name)`.

I filed bug 1255883 for this.

Comment 7

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/631c9549411d

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/631c9549411d