Closed Bug 535669 Opened 12 years ago Closed 12 years ago

Move common makefile code in if and else to the outside

Categories

(NSS :: Build, defect)

defect
Not set
trivial

Tracking

(Not tracked)

RESOLVED FIXED
3.12.6

People

(Reporter: wtc, Assigned: wtc)

Details

Attachments

(1 file)

Attached patch Proposed patchSplinter Review
lib/ssl/config.mk has some code that is common to the if and
else blocks.  It should be moved to the outside.  The equivalent
code in lib/softoken/config.mk is already done that way:
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/nss/lib/softoken/config.mk&mark=38-43,46,78,92&rev=1.29#36

cmd/platlibs.mk has the same issue.  It has another issue: PKIXLIB
has two definitions that differ only in ordering.  I move the
non-Windows definition to the outside so that I only need to test
this patch on Windows.  (The non-Windows definition lists "pkixtop"
twice.  Not sure if that's a careless mistake or required by
circular dependency.  I didn't change that in this patch.)
Attachment #418274 - Flags: review?(nelson)
Comment on attachment 418274 [details] [diff] [review]
Proposed patch

I also moved
  DEFINES += -DNSS_USE_STATIC_LIBS
to the outside, even though it's only required for
Windows.  I'll be happy to move it back if you don't
want this change.
Comment on attachment 418274 [details] [diff] [review]
Proposed patch

R+=nelson, assuming that you've built this patch on Windows and at least one other platform, and it doesn't do anything heinous on either one.  :)
Attachment #418274 - Flags: review?(nelson) → review+
Thanks.  I've built this patch on Windows and Linux.

I checked in the patch on the NSS trunk (NSS 3.12.6).

Checking in cmd/platlibs.mk;
/cvsroot/mozilla/security/nss/cmd/platlibs.mk,v  <--  platlibs.mk
new revision: 1.65; previous revision: 1.64
done
Checking in lib/ssl/config.mk;
/cvsroot/mozilla/security/nss/lib/ssl/config.mk,v  <--  config.mk
new revision: 1.30; previous revision: 1.29
done
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
On Linux, the original Windows definition of PKIXLIB results
in undefined reference linker errors, so linking with libpkixtop.a
twice is indeed necessary on some platforms.
You need to log in before you can comment on or make changes to this bug.