This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] Fix testing with nss-crypt.
- From: Carlos O'Donell <carlos at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Cc: "H.J. Lu" <hjl dot tools at gmail dot com>, Florian Weimer <fweimer at redhat dot com>
- Date: Tue, 12 Dec 2017 18:37:18 -0800
- Subject: [COMMITTED] Fix testing with nss-crypt.
- Authentication-results: sourceware.org; auth=none
A glibc master build with --enable-nss-crypt using the NSS
crypto libraries fails during make check with the following error:
<command-line>:0:0: error: "USE_CRYPT" redefined [-Werror]
<command-line>:0:0: note: this is the location of the previous
definition
This is caused by commit 36975e8e7ea227f7006abdc722ecfefe2079429b
by H.J. Lu which replaces all = with +=. The fix is to undefine
USE_CRYPT before defining it to zero.
Committed as an obvious fix. Fixes the build issue on x86_64 with
no regressions.
Signed-off-by: Carlos O'Donell <carlos@redhat.com>
2017-12-12 Carlos O'Donell <carlos@redhat.com>
* elf/Makefile [$(nss-crypt)$(static-nss-crypt) == yesno]
(CFLAGS-tst-linkall-static.c): Undefine USE_CRYPT first.
diff --git a/elf/Makefile b/elf/Makefile
index 7b8f325ccf..8563555079 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -391,7 +391,7 @@ CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=1
# library, then we exclude the use of crypt functions in the test.
# We similarly exclude libcrypt.a from the static link (see below).
ifeq (yesno,$(nss-crypt)$(static-nss-crypt))
-CFLAGS-tst-linkall-static.c += -DUSE_CRYPT=0
+CFLAGS-tst-linkall-static.c += -UUSE_CRYPT -DUSE_CRYPT=0
endif
include ../Rules
---
--
Cheers,
Carlos.