mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-19 13:40:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix testing with nss-crypt.

Browse Source 
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>
This commit is contained in:
Carlos O'Donell 2017-12-12 18:32:42 -08:00
parent 6f7c009282
commit 243b63337c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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.
2017-12-12 Joseph Myers <joseph@codesourcery.com>
* soft-fp/fmadf4.c: Move to ....

2
elf/Makefile
View File

@ -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