From: Carlos O'Donell <carlos@redhat.com>
Date: Wed, 13 Dec 2017 02:32:42 +0000 (-0800)
Subject: Fix testing with nss-crypt.
X-Git-Tag: upstream/2.30~1969
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=243b63337c2c02f30ec3a988ecc44bc0f6ffa0ad;p=platform%2Fupstream%2Fglibc.git

Fix testing with nss-crypt.

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

diff --git a/ChangeLog b/ChangeLog
index f560b2a832..22df17b671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 ....
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