1195546 - "make package" broken for universal builds on OS X

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Steven Michaud [:smichaud] (Retired)]

It's never been possible to use mach to do Mac universal builds.  But for many years you could use "make -f client.mk build" to do the build, then cd to objdir/i386 or objdir/x86_64 and run "make package".  The "make package" part broke quite recently.

Now you get a bunch of error messages running "make package", including the following (which seems to be the most significant):

    raise ObjdirMismatchException(topobjdir, _config_topobjdir)
mozbuild.base.ObjdirMismatchException: Objdir mismatch: /usr/local/src/Mozilla/mozilla-central/obj-firefox-univ/i386 != /usr/local/src/Mozilla/mozilla-central/obj-firefox-univ

I don't know why our automated builds didn't break -- they must have a workaround.

Comment 1

[Steven Michaud [:smichaud] (Retired)]

Attachment: My mozconfig for universal builds

Comment 2

[Steven Michaud [:smichaud] (Retired)]

> then cd to objdir/i386 or objdir/x86_64 and run "make package"

Actually running "make package" in objdir/x86_64 breaks for other reasons ... and may have been broken a long time.  My habit has always been to use obdir/i386 -- where (as I've said) "make package" only broke recently.

Comment 3

[Steven Michaud [:smichaud] (Retired)]

It's the following patch that caused this breakage:

https://hg.mozilla.org/mozilla-central/rev/3747bcb215b1

 bug 1190522 - Rewrite pkg-dmg as a Python script. r=gps
author	Ted Mielczarek <[e-mail]>
	Mon, 03 Aug 2015 15:40:04 -0400

Comment 4

[(not currently active) Ted Mielczarek]

So the workaround here was:
https://dxr.mozilla.org/mozilla-central/source/python/mozbuild/mozbuild/mach_commands.py#400

...which is how `make package` gets invoked in automation. Sorry, I should have also tested a local universal build. You can use that same workaround for now by running `make -C $objdir/i386 package MOZ_CURRENT_PROJECT=i386`.

Comment 5

[Steven Michaud [:smichaud] (Retired)]

> `make -C $objdir/i386 package MOZ_CURRENT_PROJECT=i386`

Thanks!  Works like a charm.

Comment 6

[Steven Michaud [:smichaud] (Retired)]

(Following up comment #2)

I just confirmed that the breakage using "make package" in obdir/x86_64 isn't caused by bug 1190522 -- it was there before that patch landed.  It's probably not worth trying to fix -- not unless enough people complain about it.

Comment 7

[(not currently active) Ted Mielczarek]

(In reply to Steven Michaud [:smichaud] from comment #6)
> I just confirmed that the breakage using "make package" in obdir/x86_64
> isn't caused by bug 1190522 -- it was there before that patch landed.  It's
> probably not worth trying to fix -- not unless enough people complain about
> it.

FYI I had filed bug 1201345 on that, it got fixed as a result of bug 762449.

Comment 8

[Phil Ringnalda (:philor)]

Well, guess who just turned into a blocker, holding mozilla-beta closed? mach_commands.py is how make package gets invoked in automation right up until we merge to beta, at which point we stop doing mozharness builds and start doing things old school, so now Mac opt builds are permared on beta and it's closed as a result.

Comment 9

[Nick Thomas [:nthomas] (UTC+12)]

Bug 1220018 has a work around in the buildbot environment.

Comment 10

[Nick Thomas [:nthomas] (UTC+12)]

And it's working, so lowering back to normal.

Comment 11

[Chris Cooper [:coop] (he/him)]

Fixed for the cross-compile case in bug 1183613.