Land NSPR 4.18 into FF 59

RESOLVED FIXED in Firefox 59

Status

()

enhancement
P1
normal
RESOLVED FIXED
2 years ago
2 years ago

People

(Reporter: kaie, Assigned: kaie)

Tracking

Trunk
mozilla59
Points:
---

Firefox Tracking Flags

(firefox59 fixed)

Details

(Whiteboard: [psm-assigned])

Attachments

(1 attachment)

FF 59 should use NSPR 4.18 to pick up the cleanup from bug 1404061.

Hopefully we'll get a fix for bug 1399746.
At the time we uplift the new NSPR to m-i, we'll need to remove the old locally applied patches.
Assignee: nobody → kaie
Attachment #8931666 - Flags: review?(dd.mozilla)
See Also: → 1420060
Keywords: leave-open
Attachment #8931666 - Flags: review?(dd.mozilla) → review+
Thank you!
Pushed by kaie@kuix.de:
https://hg.mozilla.org/integration/mozilla-inbound/rev/f7f814a5a957
land NSPR 4.18.1 beta1 (r=me) and remove local NSPR patch that's no longer necessary (r=dragana)
Flags: needinfo?(kaie) → needinfo?(dd.mozilla)
20:16:36     INFO -  mozmake.EXE[4]: Entering directory 'z:/build/build/src/obj-firefox/config/external/nspr/pr'
20:16:36     INFO -  z:/build/build/src/sccache2/sccache.exe z:/build/build/src/clang/bin/clang.exe --driver-mode=cl -Xclang -std=gnu99 -Fow95thred.obj -c -DNDEBUG=1 -DTRIMMED=1 -D_NSPR_BUILD_ -DWIN32 -DXP_PC -D_PR_GLOBAL_THREADS_ONLY -DWIN95 -UWINNT -D_AMD64_ -Iz:/build/build/src/config/external/nspr/pr -Iz:/build/build/src/obj-firefox/config/external/nspr/pr -Iz:/build/build/src/config/external/nspr -Iz:/build/build/src/nsprpub/pr/include -Iz:/build/build/src/nsprpub/pr/include/private -Iz:/build/build/src/obj-firefox/dist/include -Iz:/build/build/src/obj-firefox/dist/include/nspr -Iz:/build/build/src/obj-firefox/dist/include/nss -MD -FI z:/build/build/src/obj-firefox/mozilla-config.h -DMOZILLA_CLIENT -Qunused-arguments -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Qunused-arguments -TC -nologo -wd4091 -D_HAS_EXCEPTIONS=0 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -W3 -Gy -Zc:inline -Gw -wd4244 -wd4267 -Wno-unknown-pragmas -Wno-ignored-pragmas -Wno-deprecated-declarations -Wno-invalid-noreturn -we4553 -Z7 -Xclang -load -Xclang z:/build/build/src/obj-firefox/build/clang-plugin/clang-plugin.dll -Xclang -add-plugin -Xclang moz-check -O1 -Oi -Oy-  -deps.deps/w95thred.obj.pp    z:/build/build/src/nsprpub/pr/src/md/windows/w95thred.c
20:16:36     INFO -  clang.exe: warning: unknown argument ignored in clang-cl: '-deps.deps/w95thred.obj.pp' [-Wunknown-argument]
20:16:36     INFO -  z:/build/build/src/nsprpub/pr/src/md/windows/w95thred.c(69,12):  error: token is not a valid binary operator in a preprocessor subexpression
20:16:36     INFO -  #if define DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS
20:16:36     INFO -      ~~~~~~ ^
20:16:36     INFO -  1 error generated.
20:16:36     INFO -  z:/build/build/src/config/rules.mk:771: recipe for target 'w95thred.obj' failed
20:16:36     INFO -  mozmake.EXE[4]: *** [w95thred.obj] Error 1
20:16:36     INFO -  mozmake.EXE[4]: Leaving directory 'z:/build/build/src/obj-firefox/config/external/nspr/pr'
20:16:36     INFO -  z:/build/build/src/config/recurse.mk:73: recipe for target 'config/external/nspr/pr/target' failed
20:16:36     INFO -  mozmake.EXE[3]: *** [config/external/nspr/pr/target] Error 2
20
This was a copy-paste error from a definition of DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS

the line should be #if defined(DO_NOT_WAIT_FOR_CONNECT_OVERLAPPED_OPERATIONS)

sorry :(
Flags: needinfo?(dd.mozilla)
It's confusing that it worked on most windows configurations.
Started another try build with Dragana's suggested from bug 1421247 for all windows configurations:
https://hg.mozilla.org/try/rev/4ab29a84f3d2b9319e21f680a9169abe2720a529
(In reply to Kai Engert (:kaie:) from comment #9)
> Started another try build with Dragana's suggested from bug 1421247 for all
> windows configurations:
> https://hg.mozilla.org/try/rev/4ab29a84f3d2b9319e21f680a9169abe2720a529

https://treeherder.mozilla.org/#/jobs?repo=try&revision=4ab29a84f3d2b9319e21f680a9169abe2720a529
Pushed by kaie@kuix.de:
https://hg.mozilla.org/integration/mozilla-inbound/rev/798b87f30668
land NSPR 4.18 beta2 (r=me) and remove local NSPR patch that's no longer necessary (r=dragana)
The try build looked good. Beta2 includes Dragana's fix for the bustage.
Blocks: 1399746
Priority: -- → P1
Whiteboard: [psm-assigned]
Pushed by kaie@kuix.de:
https://hg.mozilla.org/integration/mozilla-inbound/rev/62afafe1b3d9
Land NSPR 4.18 into FF 59, NSPR_4_18_BETA4, r=me
Tagged beta5, which includes bug 1407070. Let's see if this works with Firefox tests:
https://treeherder.mozilla.org/#/jobs?repo=try&revision=24e0813b007ec1f9d695c5269f3994bd034cd625
Pushed by kaie@kuix.de:
https://hg.mozilla.org/integration/mozilla-inbound/rev/3a9a20dfd7b3
Land NSPR 4.18 into FF 59, NSPR_4_18_BETA5, r=me
Keywords: leave-open
Pushed by kaie@kuix.de:
https://hg.mozilla.org/integration/mozilla-inbound/rev/2e91a03fa6b8
uplift NSPR_4_18_RTM, no code change, only version number. Require version 4.18 for building. r=me
https://hg.mozilla.org/mozilla-central/rev/2e91a03fa6b8
Status: NEW → RESOLVED
Closed: 2 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla59
No longer blocks: 1399746
You need to log in before you can comment on or make changes to this bug.