Use system zlib on Mac OS X

RESOLVED FIXED in 3.12.6

Status

NSS
Build
RESOLVED FIXED
8 years ago
8 years ago

People

(Reporter: Wan-Teh Chang, Assigned: Wan-Teh Chang)

Tracking

unspecified
3.12.6
All
Mac OS X

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment)

(Assignee)

Description

8 years ago
Created attachment 425169 [details] [diff] [review]
Proposed patch

The attached patch allows us to use system zlib on Mac OS X.

All versions of Mac OS X that we support have zlib as a system library.
In Mac OS X 10.4 and later, the system zlib is version 1.2.3, which is
the latest release and the same version as the zlib in the NSS source
tree.

Firefox 3 requires Mac OS X 10.4 or later.

The reason we need to change the signtool and modutil makefiles
is that we can't add -lz to EXTRA_LIBS because $(PROGRAM) depends
on $(EXTRA_LIBS) in mozilla/security/coreconf/rules.mk:

$(PROGRAM): $(OBJS) $(EXTRA_LIBS)
        ...

gmake on Linux apparently has an extension that interprets
a dependency of -lz as /usr/lib/libz.so.  But gmake on Mac
OS X tries to make -lz (as expected) and fails.  So we have to
add -lz to OS_LIBS instead.
Attachment #425169 - Flags: review?(rrelyea)

Comment 1

8 years ago
Comment on attachment 425169 [details] [diff] [review]
Proposed patch

r+, but make sure that either mozilla wants this change, or if not, that they have an easy way to turn it off.

bob
Attachment #425169 - Flags: review?(rrelyea) → review+
(Assignee)

Comment 2

8 years ago
This change by itself doesn't affect Mozilla because Mozilla doesn't build
modutil and signtool.  When I check in the makefile patch in bug 275744,
this change will affect Mozilla because lib/ssl will depend on zlib, but
Mozilla can build NSS with NSS_ENABLE_ZLIB= (unsetting NSS_ENABLE_ZLIB)
to turn it off.

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

Checking in coreconf/Darwin.mk;
/cvsroot/mozilla/security/coreconf/Darwin.mk,v  <--  Darwin.mk
new revision: 1.24; previous revision: 1.23
done
Checking in nss/cmd/platlibs.mk;
/cvsroot/mozilla/security/nss/cmd/platlibs.mk,v  <--  platlibs.mk
new revision: 1.66; previous revision: 1.65
done
Checking in nss/cmd/modutil/Makefile;
/cvsroot/mozilla/security/nss/cmd/modutil/Makefile,v  <--  Makefile
new revision: 1.8; previous revision: 1.7
done
Checking in nss/cmd/signtool/Makefile;
/cvsroot/mozilla/security/nss/cmd/signtool/Makefile,v  <--  Makefile
new revision: 1.7; previous revision: 1.6
done
Status: ASSIGNED → RESOLVED
Last Resolved: 8 years ago
Resolution: --- → FIXED
Target Milestone: --- → 3.12.6
You need to log in before you can comment on or make changes to this bug.