diff options
| author | Guido Trentalancia <guido@trentalancia.net> | 2017-10-04 15:02:35 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-10-04 15:02:35 +0200 |
| commit | 57b4af1955e28c1623c98397b8597847d16bdd8c (patch) | |
| tree | d98771f87977a7f297d4947cc8d0cdbc03bcd9be /crypt | |
| parent | 64d1e08ea822bf47cb2796ad0f727136227f983c (diff) | |
| download | glibc-57b4af1955e28c1623c98397b8597847d16bdd8c.tar.gz glibc-57b4af1955e28c1623c98397b8597847d16bdd8c.tar.xz glibc-57b4af1955e28c1623c98397b8597847d16bdd8c.zip | |
crypt: Use NSPR header files in addition to NSS header files [BZ #17956]
When configuring and building GNU libc using the Mozilla NSS library for cryptography (--enable-nss-crypt option), also include the NSPR header files along with the Mozilla NSS library header files. Finally, when running the check-local-headers test, ignore the Mozilla NSPR library header files (used by the Mozilla NSS library).
Diffstat (limited to 'crypt')
| -rw-r--r-- | crypt/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypt/Makefile b/crypt/Makefile index 0280fba8a7..8bbbf2a121 100644 --- a/crypt/Makefile +++ b/crypt/Makefile @@ -37,9 +37,11 @@ routines += $(libcrypt-routines) endif ifeq ($(nss-crypt),yes) -CPPFLAGS-sha256-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir) -CPPFLAGS-sha512-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir) -CPPFLAGS-md5-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir) +nss-cpp-flags := -DUSE_NSS \ + -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir) +CPPFLAGS-sha256-crypt.c = $(nss-cpp-flags) +CPPFLAGS-sha512-crypt.c = $(nss-cpp-flags) +CPPFLAGS-md5-crypt.c = $(nss-cpp-flags) LDLIBS-crypt.so = -lfreebl3 else libcrypt-routines += md5 sha256 sha512 |