From patchwork Thu May 6 18:04:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 43269 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6316A388CC18; Thu, 6 May 2021 18:04:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6316A388CC18 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620324293; bh=OFwWBnLoXIVdoaI2ucmYNVJK9Kck8qrHivb14e7QdjY=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=ZV6WFFFfwwaLa69C8EEjn+xgxmpHlt0k23nKVSMR/ErFGEiBa1TvFhvWknrWQdQNc ge12okY2HNExFL/g/zaDTcqD6zllWJ72R3qlgGwIj8MQEyX2iVr+OHhKEZZayaEcoe JemGnKoTR2KtJxKgMIygSKWXiU2LPYvCNUcG/JGw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) by sourceware.org (Postfix) with ESMTPS id 4DFB4388CC18 for ; Thu, 6 May 2021 18:04:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4DFB4388CC18 Received: by mail-oi1-x22e.google.com with SMTP id b25so1054100oic.0 for ; Thu, 06 May 2021 11:04:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OFwWBnLoXIVdoaI2ucmYNVJK9Kck8qrHivb14e7QdjY=; b=r7I5EuCemSKfSbOyGN7OAKknXcB+CssnbcOKe0UF0eHX/BQiTMdFMsfK2nClHGM0AA hqzQKH21dxe0o65EiJbBsrlNinY+etpqviRgtHQGMOhUyYhWDyyTt/49KF0fAmEo8Qm+ MAF1ONJsnACPzyG9SqgupwpD+AL+uKJtNSuOCJD28x+a/jFdd88Kog4N01MADPWGG0nN 6B/WbgElPDsPeuDFRcthyJp3MjjDU85/mb5xF9N7RSA6r5CRg/r+IECt4QG0F2r7k5ud XlfAlv97bxcBcCGw0LRNukBJROIbNWZnWUWne2Q4DqSCTCUrC1WPgLVl51vWNmi/uSwv L8ew== X-Gm-Message-State: AOAM532w6skQaXPDA2bcOdBAUaWhY+H195Ps+9uloaKPJucofq6WjX5h uciiLpRfJTbukD+ooyDSOIVfWbtOVW/QU9WmFKA= X-Google-Smtp-Source: ABdhPJzrOpQLjoS9bn1GbpB5X2zhWEa2NraSkLcDsqDh4bu6upXjk1Z4VoZS0pw7liTXUwPf065L5lsPQtQTCq9J3ow= X-Received: by 2002:aca:dd82:: with SMTP id u124mr11650236oig.35.1620324290396; Thu, 06 May 2021 11:04:50 -0700 (PDT) MIME-Version: 1.0 References: <20210226211507.3430032-1-hjl.tools@gmail.com> <871rajhon4.fsf@oldenburg.str.redhat.com> In-Reply-To: <871rajhon4.fsf@oldenburg.str.redhat.com> Date: Thu, 6 May 2021 11:04:14 -0700 Message-ID: Subject: [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477] To: Florian Weimer X-Spam-Status: No, score=-3034.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Cc: "H.J. Lu via Libc-alpha" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Thu, May 6, 2021 at 8:23 AM Florian Weimer wrote: > > * H. J. Lu via Libc-alpha: > > > diff --git a/iconv/Makefile b/iconv/Makefile > > index 659857dd8c..4af3eea0d8 100644 > > --- a/iconv/Makefile > > +++ b/iconv/Makefile > > @@ -95,11 +95,13 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) > > $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) > > $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) > > > > -$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig > > +$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig > > (set -e; \ > > tmp=$(objpfx)gconv-modules.cache.$$$$; \ > > rm -f $$tmp; \ > > - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \ > > + $(built-program-cmd-before-env) \ > > + $(run-program-env) $(built-program-cmd-after-env) $< \ > > + --output=$$tmp --nostdlib $(inst_gconvdir); \ > > cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \ > > rm -f $$tmp) > $@; \ > > $(evaluate-test) > > Should tests use $(test-wrapper-env) instead of $(run-program-env) I think we should use $(run-program-prefix) $(objpfx)iconvconfig > $(built-program-cmd-after-env)? I think it's commonly used (mostly > along with shell scripts though). > > Thanks, > Florian > Here is the v2 patch. From 3eecd04de751a0d6df007da6826e7daa4c7609ce Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 26 Feb 2021 13:07:18 -0800 Subject: [PATCH v2] Run $(objpfx)iconvconfig with $(run-program-prefix) [BZ #27477] When glibc is configured with --enable-hardcoded-path-in-tests, "make xcheck" failed with ... env GCONV_PATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconvdata LOCPATH=/export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/localedata LC_ALL=C /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig --output=$tmp --nostdlib /usr/lib64/gconv; ... /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig: /lib64/libc.so.6: version `GLIBC_2.34' not found (required by /export/build/gnu/tools-build/glibc-cet-gitlab/build-x86_64-linux/iconv/iconvconfig) ... FAIL: iconv/test-iconvconfig Since $(objpfx)iconvconfig is an installed program, run it with $(run-program-prefix). --- iconv/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iconv/Makefile b/iconv/Makefile index 659857dd8c..a9b267c851 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -95,11 +95,12 @@ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force) $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o) $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o) -$(objpfx)test-iconvconfig.out: /dev/null $(objpfx)iconvconfig +$(objpfx)test-iconvconfig.out: $(objpfx)iconvconfig (set -e; \ tmp=$(objpfx)gconv-modules.cache.$$$$; \ rm -f $$tmp; \ - $(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir); \ + $(run-program-prefix) $(objpfx)iconvconfig \ + --output=$$tmp --nostdlib $(inst_gconvdir); \ cmp $$tmp $(inst_gconvdir)/gconv-modules.cache; \ rm -f $$tmp) > $@; \ $(evaluate-test) -- 2.31.1