summaryrefslogtreecommitdiff
path: root/nss
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-17 08:57:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2012-07-17 08:57:52 +0200
commitd4e26ea852c48cff41443f6f4378b6bc47b8193a (patch)
treeff156be8c992888afb4e1d81a1493374bf8c4444 /nss
parent309402a82272e7fc2cab75ca65764bf81ce311d6 (diff)
-Werror=implicit-function-declaration
...when building --without-system-zlib on Linux. Change-Id: I9bcb355ec75291609b28397c16068acf293ba6eb
Diffstat (limited to 'nss')
-rw-r--r--nss/makefile.mk5
-rw-r--r--nss/nss-3.13.5-zlib-werror.patch10
2 files changed, 14 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk
index c123ef8512ac..505bcfdd1e14 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -48,7 +48,10 @@ VER_PATCH=5
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
+PATCH_FILES=nss.patch nss.aix.patch nss-config.patch \
+ nss-3.13.5-zlib-werror.patch
+# nss-3.13.5-zlib-werror.patch: avoid -Werror=implicit-function-declaration for
+# lseek, read, write
.IF "$(OS)"=="MACOSX"
PATCH_FILES+=nss_macosx.patch
diff --git a/nss/nss-3.13.5-zlib-werror.patch b/nss/nss-3.13.5-zlib-werror.patch
new file mode 100644
index 000000000000..390dd1fdc0d3
--- /dev/null
+++ b/nss/nss-3.13.5-zlib-werror.patch
@@ -0,0 +1,10 @@
+--- misc/nss-3.13.5/mozilla/security/nss/lib/zlib/gzguts.h 2010-08-22 03:07:03.000000000 +0200
++++ misc/build/nss-3.13.5/mozilla/security/nss/lib/zlib/gzguts.h 2012-07-17 08:52:14.821552788 +0200
+@@ -26,6 +26,7 @@
+ # include <limits.h>
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+
+ #ifdef NO_DEFLATE /* for compatibility with old definition */
+ # define NO_GZCOMPRESS