520359 - pymake fails to build Firefox

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mitchell Field [:Mitch]]

Attachment: Patch v1.0

Building Firefox from mozilla-central, using pymake currently fails.

This patch fixes the non-NSPR parts. (Ted did all the work.)

Comment 1

[Mitchell Field [:Mitch]]

Attachment: Patch v1.0 (Part Deux)

This patch fixes the NSPR part. (Again, Ted did all the work.)

Comment 2

[Benjamin Smedberg]

Comment on attachment 404411 [details] [diff] [review]
Patch v1.0

>diff --git a/config/config.mk b/config/config.mk

> ifeq (,$(filter-out WINCE,$(OS_ARCH)))
> NSINSTALL	= $(CYGWIN_WRAPPER) nsinstall
>-INSTALL     = $(CYGWIN_WRAPPER) nsinstall 
>+INSTALL     = $(CYGWIN_WRAPPER) nsinstall
> endif

Did you mean to use HOST_BIN_SUFFIX here, or why did you change this line at all?

Comment 3

[(not currently active) Ted Mielczarek]

I think I did initially change that, but then reverted it, but I guess I wound up removing some trailing whitespace there.

Comment 4

[(not currently active) Ted Mielczarek]

Comment on attachment 404412 [details] [diff] [review]
Patch v1.0 (Part Deux)

wtc, this is needed to get through a build with pymake, because `pwd` prints an MSYS path, and pymake wants Windows-style paths. $(CURDIR) has been available since GNU Make 3.77.

Comment 5

[Wan-Teh Chang]

Comment on attachment 404412 [details] [diff] [review]
Patch v1.0 (Part Deux)

r=wtc.

This construct is also used in mozilla/security/coreconf/rules.mk:
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/coreconf/rules.mk&rev=1.81&mark=394,400,403,409,413#388

Comment 6

[(not currently active) Ted Mielczarek]

It looks like we're ok there, since they explicitly handle Win32 paths. We could probably simplify that whole block to use $(CURDIR), though.

Comment 7

[(not currently active) Ted Mielczarek]

Comment on attachment 404412 [details] [diff] [review]
Patch v1.0 (Part Deux)

Landed on NSPR trunk:
Checking in config/rules.mk;
/cvsroot/mozilla/nsprpub/config/rules.mk,v  <--  rules.mk
new revision: 3.73; previous revision: 3.72
done

Comment 8

[(not currently active) Ted Mielczarek]

Pushed the other patch to m-c:
http://hg.mozilla.org/mozilla-central/rev/ccb86dc8e0da

We'll need to get NSPR updated on trunk to pick up the other fix.

Comment 9

[(not currently active) Ted Mielczarek]

I updated NSPR on m-c, so this should all work again:
http://hg.mozilla.org/mozilla-central/rev/d82fe5d73822

Comment 10

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 404411 [details] [diff] [review]
Patch v1.0

a192=beltzner

Comment 11

[Brad Lassey [:blassey] (use needinfo?)]

pushed http://hg.mozilla.org/releases/mozilla-1.9.2/rev/171e66b6364d