Calculation of NSS_STATIC_LIBS should remove carriage returns

RESOLVED FIXED in Firefox -esr31, Firefox OS v2.0

Status

()

Core
Build Config
RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: mshal, Assigned: mshal)

Tracking

Trunk
mozilla33
All
Windows XP
Points:
---

Firefox Tracking Flags

(firefox-esr31 fixed, b2g-v2.0 fixed)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

3 years ago
In security/build/Makefile.in NSS_STATIC_LIBS is calculated with a $(shell) command. In some circumstances on Windows builds, this can result in a carriage return ('\r') in the variable, which prevents $(filter-out %.lib) from working properly.
(Assignee)

Comment 1

3 years ago
Created attachment 8453244 [details] [diff] [review]
0002-Bug-1036569-Fix-NSS_STATIC_LIBS-with-carriage-return.patch
Assignee: nobody → mshal
Attachment #8453244 - Flags: review?(mh+mozilla)
(Assignee)

Updated

3 years ago
Blocks: 978211
Comment on attachment 8453244 [details] [diff] [review]
0002-Bug-1036569-Fix-NSS_STATIC_LIBS-with-carriage-return.patch

Review of attachment 8453244 [details] [diff] [review]:
-----------------------------------------------------------------

::: security/build/Makefile.in
@@ +284,5 @@
>  # TODO: The following can be replaced by something simpler when bug 844880
>  # is fixed.
>  # All static libraries required for nss, smime, ssl and nssutil.
> +# Linefeeds are removed with tr, since they hang around in some cases on Windows.
> +NSS_STATIC_LIBS := $(shell $(MAKE) --no-print-directory -f $(srcdir)/nss.mk DEPTH='$(DEPTH)' topsrcdir='$(topsrcdir)' srcdir='$(srcdir)' echo-variable-libs | tr -d '\r')

Why not simply $(strip $(shell)) without tr?
Attachment #8453244 - Flags: review?(mh+mozilla) → review+
(Assignee)

Comment 3

3 years ago
Created attachment 8453814 [details] [diff] [review]
0001-Bug-1036569-Fix-NSS_STATIC_LIBS-with-carriage-return.patch

Derp, that works too :). r+ carried forward.
Attachment #8453244 - Attachment is obsolete: true
Attachment #8453814 - Flags: review+
(Assignee)

Comment 4

3 years ago
https://hg.mozilla.org/integration/mozilla-inbound/rev/1ac686c5f344
https://hg.mozilla.org/mozilla-central/rev/1ac686c5f344
Status: NEW → RESOLVED
Last Resolved: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla33
(Assignee)

Updated

3 years ago
status-b2g-v2.0: --- → fixed
status-firefox-esr31: --- → fixed
You need to log in before you can comment on or make changes to this bug.