diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-14 00:05:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-16 18:19:10 +0200 |
| commit | 7e6a07a6d2bcf50925fc499ec53216c960692f79 (patch) | |
| tree | 218d4718b6e24caed96cb3b7a07d3f59ceebf106 /nss/makefile.mk | |
| parent | 7cdda27c17ddb309d7473b311485b970d57562b5 (diff) | |
nss: upgrade to 3.13.5
- drop nss-linux3.patch, builds out of the box on Linux 3.x now
- drop nss-string-concat.patch, was fixed upstream
- drop nss-clang_os_Linux_x86_s_comments.patch
nss-clang_os_Linux_x86_64_s_comments.patch
the invalid asm comments were fixed upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=624868
- drop nss-asm-fix.patch, fixed upstream:
https://bugzilla.mozilla.org/show_bug.cgi?id=671711
- not updated nss.patch.mingw since it looks unmaintained
- remove the setting of FREEBL_NO_DEPEND, which is
a) no longer necessary, because it will be set automatically
on Linux 2.6
b) harmful because it prevents automatic setting of FREEBL_LOWHASH,
which is necessary to prevent conflicts with system libfreebl3.so
at least on Fedora 16/17
Change-Id: Idf9338d83f9b34000068c1b8691ca3135f56dd21
Diffstat (limited to 'nss/makefile.mk')
| -rw-r--r-- | nss/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 433885786237..c123ef8512ac 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -42,13 +42,13 @@ all: .ENDIF VER_MAJOR=3 -VER_MINOR=12 -VER_PATCH=8 +VER_MINOR=13 +VER_PATCH=5 -TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.8.6 -TARFILE_MD5=71474203939fafbe271e1263e61d083e +TARFILE_NAME=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-with-nspr-4.9.1 +TARFILE_MD5=a0a861f539f0e7a91d05e6b9457e4db1 TARFILE_ROOTDIR=nss-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) -PATCH_FILES=nss.patch nss.aix.patch nss-config.patch nss-linux3.patch nss-clang_os_Linux_x86_s_comments.patch nss-clang_os_Linux_x86_64_s_comments.patch nss-string-concat.patch nss-asm-fix.patch +PATCH_FILES=nss.patch nss.aix.patch nss-config.patch .IF "$(OS)"=="MACOSX" PATCH_FILES+=nss_macosx.patch @@ -98,10 +98,9 @@ OUT2BIN=config/nspr-config mozilla/security/nss/nss-config BUILD_DIR=mozilla/security/nss BUILD_ACTION= $(GNUMAKE) nss_build_all -j1 -#See #i105566# && moz#513024# -.IF "$(OS)"=="LINUX" -BUILD_ACTION+=FREEBL_NO_DEPEND=1 -.ENDIF +#Note: with the new version the libfreebl3.so gets built in a way that does +# not conflict with the system one on Linux automatically; +# it is no longer necessary to add a workaround for #i105566# && moz#513024# .IF "$(OS)$(COM)"=="SOLARISGCC" BUILD_ACTION+=NS_USE_GCC=1 .ENDIF |