535669 - Move common makefile code in if and else to the outside

Status: RESOLVED FIXED

(NSS :: Build, defect)

Description

[Wan-Teh Chang]

Attachment: Proposed patch

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.)

Comment 1

[Wan-Teh Chang]

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 2

[Nelson Bolyard (seldom reads bugmail)]

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.  :)

Comment 3

[Wan-Teh Chang]

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

Comment 4

[Wan-Teh Chang]

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.