Closed
Bug 736066
Opened 12 years ago
Closed 12 years ago
Build NSS object files more like the rest of the tree
Categories
(Firefox Build System :: General, defect)
Firefox Build System
General
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla15
People
(Reporter: glandium, Assigned: glandium)
References
(Depends on 1 open bug)
Details
Attachments
(2 files)
7.89 KB,
patch
|
ted
:
review+
|
Details | Diff | Splinter Review |
3.52 KB,
text/plain
|
Details |
Bug 632954 gets easier if NSS object files are just in $objdir/$relative_srcdir instead of $objdir/nss/$library_name.
Assignee | ||
Comment 1•12 years ago
|
||
I tested the hack on windows with both pymake and GNU make (which is why there is the $(shell cd $(topsrcdir);pwd)). At the same time, I seriously simplified security/manager/Makefile.in Pushed to try for more confidence: https://tbpl.mozilla.org/?tree=Try&rev=01ef33e1d8a7
Attachment #606197 -
Flags: review?(ted.mielczarek)
Comment 2•12 years ago
|
||
Comment on attachment 606197 [details] [diff] [review] Build NSS object files more like the rest of the tree, and simplify security/manager/Makefile.in Review of attachment 606197 [details] [diff] [review]: ----------------------------------------------------------------- Despite being kind of crazy, this patch improves security/manager/Makefile.in an awful lot. ::: security/manager/Makefile.in @@ +184,5 @@ > DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 > endif > ABS_topsrcdir := $(call core_abspath,$(topsrcdir)) > +# Hack to force NSS build system to use "normal" object directories > +DEFAULT_GMAKE_FLAGS += BUILD='$(MOZ_BUILD_ROOT)/security/$$(subst $(shell cd $(topsrcdir); pwd)/security/,,$$(CURDIR))' I'm a little worried about adding a ton of shell invocations for this pwd. Can you do the pwd once in this Makefile and just use that variable in this assignment?
Attachment #606197 -
Flags: review?(ted.mielczarek) → review+
Updated•12 years ago
|
Assignee: nobody → mh+mozilla
Assignee | ||
Comment 3•12 years ago
|
||
(In reply to Ted Mielczarek [:ted] from comment #2) > Comment on attachment 606197 [details] [diff] [review] > Build NSS object files more like the rest of the tree, and simplify > security/manager/Makefile.in > > Review of attachment 606197 [details] [diff] [review]: > ----------------------------------------------------------------- > > Despite being kind of crazy, this patch improves > security/manager/Makefile.in an awful lot. > > ::: security/manager/Makefile.in > @@ +184,5 @@ > > DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DBM=1 > > endif > > ABS_topsrcdir := $(call core_abspath,$(topsrcdir)) > > +# Hack to force NSS build system to use "normal" object directories > > +DEFAULT_GMAKE_FLAGS += BUILD='$(MOZ_BUILD_ROOT)/security/$$(subst $(shell cd $(topsrcdir); pwd)/security/,,$$(CURDIR))' > > I'm a little worried about adding a ton of shell invocations for this pwd. > Can you do the pwd once in this Makefile and just use that variable in this > assignment? The $(shell) is invoked once, when appending to DEFAULT_GMAKE_FLAGS. It's subst and CURDIR that are used when building NSS.
Comment 4•12 years ago
|
||
Aha, thanks.
Assignee | ||
Comment 5•12 years ago
|
||
https://hg.mozilla.org/integration/mozilla-inbound/rev/369ad04efa1f
Comment 6•12 years ago
|
||
Is it possible that this causes crashes if one doesn't do a clobber build? Some in https://hg.mozilla.org/mozilla-central/pushloghtml?startID=22381&endID=22382 seems to cause that, and I got crashes in pk11obj.c:633
Comment 7•12 years ago
|
||
https://hg.mozilla.org/mozilla-central/rev/369ad04efa1f
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla14
Comment 8•12 years ago
|
||
Clobber build didn't help. I'm not at all sure whether this change caused the problem, but something in the latest merge causes m-c to crash very soon on this 64bit linux.
Comment 9•12 years ago
|
||
Yes, this causes the crash.
Comment 10•12 years ago
|
||
Backed out of m-c: https://hg.mozilla.org/mozilla-central/rev/4a8a5e8ef78b
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
Attachment #611244 -
Attachment is patch: false
Assignee | ||
Comment 11•12 years ago
|
||
Where is the crash occurring? I don't see anything on tbpl.
Comment 12•12 years ago
|
||
Crashes locally for smaug, backing out locally fixed it for him.
Assignee | ||
Comment 13•12 years ago
|
||
Then I'll need a build log...
Comment 14•12 years ago
|
||
I tried again with gcc, and no crash. (The previous build was with clang.)
Assignee | ||
Comment 15•12 years ago
|
||
https://hg.mozilla.org/integration/mozilla-inbound/rev/5bc899138eb4
Target Milestone: mozilla14 → mozilla15
Comment 16•12 years ago
|
||
https://hg.mozilla.org/mozilla-central/rev/5bc899138eb4
Status: REOPENED → RESOLVED
Closed: 12 years ago → 12 years ago
Resolution: --- → FIXED
Updated•6 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•