166933 - Mac build changes for NSS 3.6

Status: RESOLVED FIXED

(NSS :: Build, defect, P1)

Description

[Wan-Teh Chang]

In NSS 3.6, the following .h and .c files are added
to mozilla/security/nss/lib, which is used by the
Mozilla client:

mozilla/security/nss/lib/certdb/certi.h

mozilla/security/nss/lib/ckfw/builtins/nssckbi.h

mozilla/security/nss/lib/pk11wrap/debug_module.c

mozilla/security/nss/lib/softoken/dbmshim.c

mozilla/security/nss/lib/util/quickder.c

certi.h is an internal header.  nssckbi.h is a public
header.  NSS does not have any MANIFEST files for the
Mac, so I believe nothing needs to be done for certi.h
and nssckbi.h.

The three .c files need to be added to the Mac project
files.  I will attach a patch.

Comment 1

[Wan-Teh Chang]

Attachment: Proposed patch (a Unix text file)

Turns out that lib/pk11wrap/debug_module.c is not compiled
directly but is included by lib/pk11wrap/pk11load.c.  So I
don't think it needs to be added to the project file.

This patch adds dbmshim.c to softoken.xml and quickder.c to
util.xml.  I've checked it in.

Javi, could you please do a verification build of Mozilla
(either the tip or 1.1) against the tip of NSS?  You will
need to edit mozilla/build/mac/build_scripts/MozillaCheckoutList.txt
to check out mozilla/security/nss without any cvs tag.
Please do both debug and optimized builds.  Thanks.

Comment 2

[Javier Delgadillo]

Attachment: Additional changes required to get Mac building (this is only for debug so far)

Comment 3

[Wan-Teh Chang]

Attachment: Additional changes v2

This patch addresses the issues that Javi reported.

Note that in dbmshim.c I avoided the (char*) typecast
by declaring 'b' as an array of char's.  I had to
change the prototype of dbs_replaceSlash as well
because 'b' is passed to it.

Comment 4

[Wan-Teh Chang]

All the fixes have been checked in.  NSS_3_6_BETA1
builds on the Mac.