diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 14:06:55 +0100 |
| commit | 3934efe28c70b1c21a60f38fe726a935c15f4e99 (patch) | |
| tree | c322f38a215b05ff0c457366e08fab9255b64114 /nss | |
| parent | 134fe756a1659e352c96d0a6da34dd3c7d23e3a9 (diff) | |
sigh, need a 64bit zlib too on windows, reverting
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/nss.patch | 14 | ||||
| -rw-r--r-- | nss/prj/build.lst | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/nss/nss.patch b/nss/nss.patch index 3764cc46044f..6930e6753ac9 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -67,6 +67,20 @@ LDFLAGS += $(ARCHFLAG) # INCLUDES += -I/usr/include -Y/usr/include/linux +@@ -158,8 +161,13 @@ + # + CPU_TAG = _$(CPU_ARCH) + ++ifeq ($(SYSTEM_ZLIB),YES) ++# Currently (3.12.4) only the tools modutil and signtool are linked with libz ++# If USE_SYSTEM_ZLIB is not set then the tools link statically libzlib.a which ++# is also build in nss. + USE_SYSTEM_ZLIB = 1 + ZLIB_LIBS = -lz ++endif + + # The -rpath '$$ORIGIN' linker option instructs this library to search for its + # dependencies in the same directory where it resides. --- misc/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2009-06-11 02:55:32.000000000 +0200 +++ misc/build/nss-3.12.8/mozilla/security/coreconf/SunOS5.mk 2010-06-11 16:35:54.985571182 +0200 @@ -89,8 +89,12 @@ diff --git a/nss/prj/build.lst b/nss/prj/build.lst index 23cea65d27d9..14963fff7c8d 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,3 +1,3 @@ -ns nss : solenv ZLIB:zlib NULL +ns nss : solenv NULL ns nss nmake - usr1 ns_mkout NULL ns nss nmake - all ns_nss NULL |