From patchwork Tue Sep 24 08:42:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1988816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=OoDlaOwf; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XCYJw6kFXz1xsN for ; Tue, 24 Sep 2024 18:42:40 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7F49A3858424 for ; Tue, 24 Sep 2024 08:42:38 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 3CB853858D26 for ; Tue, 24 Sep 2024 08:42:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3CB853858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3CB853858D26 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727167344; cv=none; b=BpABV11qNWz3OWqDEn9+8/+96kSIB6cDqO8rmFzCesMvfdyb+4c3sFUXcUpbSDYab1JFyalFK9JpnBZql8Qhg82oQsIe1ZraJPxV/2hYfJqMCRlxKRre9vc18/nXmdCuLfO5hYy1Q6Ur+qbe/LqD4eyWLZNPGOclpFKst5R+FxQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1727167344; c=relaxed/simple; bh=u1N9XMfu2l9AaZ8l5YcbhxPod4WYQe3CRisakXYwzQQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=g0Ub8RcUAdGKO8Yd4ZuyIMLjN5K1CGZs+bd6akAR36pTdoqh5+nnRn+lrGYk1adERbUhdUQTrF78dZpw4EKW+iSF2olWVtxyK48p7o2WkdexxqjEECkn6c0Pz6g9DDum5d7Pf7NYadN+Tkk4SLOgjCdVxmfE6k/czUpW/VasgOg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1727167342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=nMjxvsBSHSd12bUFZ2uKJVYsH0Xehm3bPCmBih4tyTs=; b=OoDlaOwfb20NHHiG8J6A+z8hjTh9Ab/txLZUlfAgtiLHhq2oRHwlDNtL0H4B3AhdAkN+1V Hhec4ISg/R3+ou/rnp88EXvKHpoJhTuRhzII3UechY6n156d5Ur4nziywT5K0SCVF772o9 bWJ8DihAlV88GdQ4dhYVEeU0zGwEXhs= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-114-O2lSGsE6PxCzCbHIiyzEIw-1; Tue, 24 Sep 2024 04:42:21 -0400 X-MC-Unique: O2lSGsE6PxCzCbHIiyzEIw-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CC686190ECFE for ; Tue, 24 Sep 2024 08:42:20 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.45.225.92]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DDCE619560AA for ; Tue, 24 Sep 2024 08:42:19 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] iconv: Use $(run-program-prefix) for running iconv (bug 32197) Date: Tue, 24 Sep 2024 10:42:16 +0200 Message-ID: <871q19h28n.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org With --enable-hardcoded-path-in-tests, $(test-program-prefix) does not redirect to the built glibc, but we need to run iconv (the program) against the built glibc even with --enable-hardcoded-path-in-tests, as it is using the ABI path for the dynamic linker (as an installed program). Use $(run-program-prefix) instead. Reviewed-by: H.J. Lu --- iconv/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 16a59571e4e9fd019d3fc23a2e7d73c1df8bb5cb diff --git a/iconv/Makefile b/iconv/Makefile index c9af0c4d44..de9d964ed3 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -153,14 +153,14 @@ $(objpfx)tst-translit-mchar.out: tst-translit-mchar.sh \ $(objpfx)tst-iconv_prog-buffer.out: \ tst-iconv_prog-buffer.sh $(objpfx)iconv_prog - $(BASH) $< $(common-objdir) '$(test-program-prefix)' > $@; \ + $(BASH) $< $(common-objdir) '$(run-program-prefix)' > $@; \ $(evaluate-test) $(objpfx)tst-iconv_prog-buffer-tiny.out: \ tst-iconv_prog-buffer.sh $(objpfx)iconv_prog - $(BASH) $< $(common-objdir) '$(test-program-prefix)' \ + $(BASH) $< $(common-objdir) '$(run-program-prefix)' \ '--buffer-size=1' > $@; \ $(evaluate-test) $(objpfx)tst-iconv_prog-buffer-large.out: \ tst-iconv_prog-buffer.sh $(objpfx)iconv_prog - $(BASH) $< $(common-objdir) '$(test-program-prefix)' '' '22' > $@; \ + $(BASH) $< $(common-objdir) '$(run-program-prefix)' '' '22' > $@; \ $(evaluate-test)