1237869 - NSPR tweaks for building with Mozilla's build system

Status: RESOLVED FIXED

(NSPR :: NSPR, defect)

Description

[(not currently active) Ted Mielczarek]

I hit just two things I needed to fix to make NSPR build with moz.build files:
1) The top-level configure defines WIN32_LEAN_AND_MEAN which makes a Windows header not get included for one file.
2) For Android the visibility flags are different which breaks a file that declares "extern void *__mmap2".

Comment 1

[(not currently active) Ted Mielczarek]

Attachment: MozReview Request: bug 1237869 - Tweak NSPR to build with Mozilla's build system. r?glandium

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

Comment 2

[(not currently active) Ted Mielczarek]

Attachment: MozReview Request: bug 1237863 - Silence linker errors from MOZ_FOLD_LIBS on Windows. r?glandium

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

Comment 3

[(not currently active) Ted Mielczarek]

Attachment: MozReview Request: bug 1230117 - Stop using NSPR's configure. r?glandium

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

Comment 4

[(not currently active) Ted Mielczarek]

Comment on attachment 8706714 [details]
MozReview Request: bug 1237869 - Tweak NSPR to build with Mozilla's build system. r?glandium

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

Comment 5

[Mike Hommey [:glandium]]

Comment on attachment 8706714 [details]
MozReview Request: bug 1237869 - Tweak NSPR to build with Mozilla's build system. r?glandium

https://reviewboard.mozilla.org/r/29983/#review27659

::: nsprpub/pr/src/md/unix/unix.c:2718
(Diff revision 2)
> -extern void *__mmap2(void *, size_t, int, int, int, size_t);
> + PR_IMPORT(void) *__mmap2(void *, size_t, int, int, int, size_t);

No need for the extra whitespace at the beginning of the line :)

::: nsprpub/pr/src/md/windows/ntinrval.c:14
(Diff revision 2)
> +#endif

Why not add DEFINES['WIN32_LEAN_AND_MEAN'] = False to the nspr moz.build?

Comment 6

[(not currently active) Ted Mielczarek]

https://reviewboard.mozilla.org/r/29983/#review27659

> Why not add DEFINES['WIN32_LEAN_AND_MEAN'] = False to the nspr moz.build?

That doesn't work because the define comes from mozilla-config.h, which gets -included. The alternative would be to manually include the header it needs, but I was worried about breaking something wierd like WinCE.

Comment 7

[(not currently active) Ted Mielczarek]

Comment on attachment 8706714 [details]
MozReview Request: bug 1237869 - Tweak NSPR to build with Mozilla's build system. r?glandium

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

Comment 8

[Mike Hommey [:glandium]]

Comment on attachment 8706714 [details]
MozReview Request: bug 1237869 - Tweak NSPR to build with Mozilla's build system. r?glandium

https://reviewboard.mozilla.org/r/29983/#review28091

Comment 9

[(not currently active) Ted Mielczarek]

https://hg.mozilla.org/projects/nspr/rev/3e2ddcbcd3b05ddd55f6a109c716350eee0b233a
bug 1237869 - Tweak NSPR to build with Mozilla's build system. r=glandium

Comment 10

[(not currently active) Ted Mielczarek]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e506ae694a2216452514ad8327989f12e687b63b
bug 1237869 - Tweak NSPR to build with Mozilla's build system. r=glandium

Comment 11

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/e506ae694a22