diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-10 17:42:35 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-10 17:56:24 +0200 |
| commit | 09373d45838e4dab514e37dee4a4c8f6218ebda0 (patch) | |
| tree | 91381d15cb0c7b29072c79a30eee7fd0d8635768 /nss | |
| parent | 76d098a07bb2f901948d39522954dff6b50adae8 (diff) | |
soltools: remove Package_inc and empty unistd.h nonsense
Change-Id: Ic05de69951b28b9cc8d62f0a534b507c424e6b25
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/ExternalProject_nss.mk | 4 | ||||
| -rw-r--r-- | nss/nss-3.13.5-zlib-werror.patch | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk index c62861aec131..5bd53613f028 100644 --- a/nss/ExternalProject_nss.mk +++ b/nss/ExternalProject_nss.mk @@ -9,10 +9,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,nss)) -$(eval $(call gb_ExternalProject_use_externals,nss,\ - unistd_headers \ -)) - $(eval $(call gb_ExternalProject_register_targets,nss,\ configure \ build \ diff --git a/nss/nss-3.13.5-zlib-werror.patch b/nss/nss-3.13.5-zlib-werror.patch index 390dd1fdc0d3..c3440c8ed99f 100644 --- a/nss/nss-3.13.5-zlib-werror.patch +++ b/nss/nss-3.13.5-zlib-werror.patch @@ -1,10 +1,12 @@ --- 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 @@ +@@ -26,6 +26,9 @@ # include <limits.h> #endif #include <fcntl.h> ++#ifndef _WIN32 +#include <unistd.h> ++#endif #ifdef NO_DEFLATE /* for compatibility with old definition */ # define NO_GZCOMPRESS |