From patchwork Wed Dec 13 02:37:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos O'Donell X-Patchwork-Id: 847719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-88093-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="kCeAayIe"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yxLSs1Hfvz9t2Z for ; Wed, 13 Dec 2017 13:37:32 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:cc:from:subject:message-id:date :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=FxF9eZnlptOrYluiQ5/N7G3wSxGeV3XjU7a8uys8bATN6/8eBcaer QDKJ+pLEfgGP1auLkaU0BzgbQfqyatloTN93qBOM9zqjaoOn4XzIqjIlvGHXXUB2 4WZ4CzTYaWtJ2FsMW2Vn8qNMEXKLxuTL/Pzqdz/xj1IKAThTZR2Hvw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:to:cc:from:subject:message-id:date :mime-version:content-type:content-transfer-encoding; s=default; bh=CSoUjV6R+NGNHHbhmI+LBL2v6bg=; b=kCeAayIeBo5+hXVvGYVkxpKmpQBU UqCEvZpZUouked0wQFit9oFWQ1vgNl0glsnEY7yTLkQ1gceNg40Sz2ck6B+CiI7w o0k56DcdeoGrHQ5RhmsN/Dcqo4Dz61DqlCDbvkX0Cxbi4mGGy4rIR88mE/DuYh67 j674ymR0URwDSWI= Received: (qmail 81583 invoked by alias); 13 Dec 2017 02:37:26 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 81571 invoked by uid 89); 13 Dec 2017 02:37:25 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f194.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:organization:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=duDz41nZFDQE+Psi+qVaKqkRo1+yty87L/Dlhatib5Y=; b=JLK2jVBAsrIS+ZAIxNP0XC1L849t20Izwx6aiUSOMi34OksvIsGy7L/E5Uq3UAajn3 +4Q9V2soFvr5MgpiCfDLKItojJsRp421RAgFmj+mu5KSCmTgY4S3V0DbEvIUIhNPqEO4 Dti/yo/fR4CO8EVwcc9QOOdj8t+zu4xBIsRhLFnjSz9HTERn4oLYZM1te5+7JenVp8j/ bofwLSYMNWkjAHWRzeQ+p5RIb2Ll+Gcead1ulII6xJq5mRWhNC2DX36W59BpXURDx1iQ Sps1iXK1k72TN4zLE4gTXG4afFsKaSejIfLWVIUwDko82BRpFmUq/tPyUKbqaxifkzJ1 KmQA== X-Gm-Message-State: AKGB3mIuCfzkxhuiXDMgDY7H9xMBP4yAn8hXwClBm79JqudT6Omjud+x hoJffHmWiL4Hjh8jQj2T3ikqww== X-Google-Smtp-Source: ACJfBosB18CbvXusuvWgvlUKxLcdg32pzjItOS2zJEuTtWyAn0yjkOKoEZ+Kp5aS8HE5lvMlJEbOqw== X-Received: by 10.200.24.221 with SMTP id o29mr9003034qtk.281.1513132642441; Tue, 12 Dec 2017 18:37:22 -0800 (PST) To: GNU C Library Cc: "H.J. Lu" , Florian Weimer From: Carlos O'Donell Subject: [COMMITTED] Fix testing with nss-crypt. Message-ID: <2c109c05-9aed-2728-db63-bd7f967524f3@redhat.com> Date: Tue, 12 Dec 2017 18:37:18 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 A glibc master build with --enable-nss-crypt using the NSS crypto libraries fails during make check with the following error: :0:0: error: "USE_CRYPT" redefined [-Werror] :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 2017-12-12 Carlos O'Donell * 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