diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-12 16:05:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-13 13:15:25 +0100 |
| commit | 452af5f4522e750627d0c0ac9fbc794aeb1f1f8f (patch) | |
| tree | 950d062f9e183873d64b06e212568a3b0968bb58 /nss | |
| parent | 99b04ed2be3023bec874fce529d453123f48ac99 (diff) | |
gbuildize internal zlib
and stick headers into the solver in the same hierarchy as is "standard"
so we don't have to patch so much, similiarly rename to libz
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/nss.patch | 14 | ||||
| -rw-r--r-- | nss/prj/build.lst | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/nss/nss.patch b/nss/nss.patch index 6930e6753ac9..3764cc46044f 100644 --- a/nss/nss.patch +++ b/nss/nss.patch @@ -67,20 +67,6 @@ 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 14963fff7c8d..23cea65d27d9 100644 --- a/nss/prj/build.lst +++ b/nss/prj/build.lst @@ -1,3 +1,3 @@ -ns nss : solenv NULL +ns nss : solenv ZLIB:zlib NULL ns nss nmake - usr1 ns_mkout NULL ns nss nmake - all ns_nss NULL |