1039197 - Always build js engine with zlib

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Mike Hommey [:glandium]]

Bug 776704 made standalone js builds work on windows by disabling the zlib-dependent code. But with all the recent changes, it's now straightforward to have standalone js builds use the in-tree zlib.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Always build js engine with zlib

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8456717 [details] [diff] [review]
Always build js engine with zlib

Gary, could you check this works properly on windows?

Comment 3

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

(In reply to Mike Hommey [:glandium] from comment #2)
> Gary, could you check this works properly on windows?

Sure, but I can only check after bug 1038590 is fixed, and I'm out next week, so maybe after that. I'll get to it earlier if I have the chance, though.

Comment 4

[Luke Wagner [:luke]]

Comment on attachment 8456717 [details] [diff] [review]
Always build js engine with zlib

rs=me

Comment 5

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

Comment on attachment 8456717 [details] [diff] [review]
Always build js engine with zlib

Bug 1038590 is my fault. I've since fixed my harness.

For this patch, I now know that without this patch, the shell compiles successfully. With this patch, it fails at:

Unified_cpp_js_src9.obj : error LNK2019: unresolved external symbol _MOZ_Z_deflateEnd referenced in function "public: __thiscall js::Compressor::~Compressor(void)" (??1Compressor@js@@QAE@XZ)

Unified_cpp_js_src9.obj : error LNK2019: unresolved external symbol _MOZ_Z_deflateInit_ referenced in function "public: bool __thiscall js::Compressor::init(void)" (?init@Compressor@js@@QAE_NXZ)

Unified_cpp_js_src9.obj : error LNK2019: unresolved external symbol _MOZ_Z_deflate referenced in function "public: enum js::Compressor::Status __thiscall js::Compressor::compressMore(void)" (?compressMore@Compressor@js@@QAE?AW4Status@12@XZ)

Unified_cpp_js_src9.obj : error LNK2019: unresolved external symbol _MOZ_Z_inflateEnd referenced in function "bool __cdecl js::DecompressString(unsigned char const *,unsigned int,unsigned char *,unsigned int)" (?DecompressString@js@@YA_NPBEIPAEI@Z)

Unified_cpp_js_src9.obj : error LNK2019: unresolved external symbol _MOZ_Z_inflate referenced in function "bool __cdecl js::DecompressString(unsigned char const *,unsigned int,unsigned char *,unsigned int)" (?DecompressString@js@@YA_NPBEIPAEI@Z)

Unified_cpp_js_src9.obj : error LNK2019: unresolved external symbol _MOZ_Z_inflateInit_ referenced in function "bool __cdecl js::DecompressString(unsigned char const *,unsigned int,unsigned char *,unsigned int)" (?DecompressString@js@@YA_NPBEIPAEI@Z)

mozjs-33a1.dll : fatal error LNK1120: 6 unresolved externals

Comment 6

[Gary Kwong [:gkw] [:nth10sd] (NOT official MoCo now)]

Attachment: configure log and build failure log

Comment 7

[Mike Hommey [:glandium]]

Landed with a fixup for comment 5:
https://hg.mozilla.org/integration/mozilla-inbound/rev/63c52b7ddc28

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/63c52b7ddc28