From patchwork Sat Feb 8 16:09:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Andreas K. Huettel" X-Patchwork-Id: 106164 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 BD29B3857731 for ; Sat, 8 Feb 2025 16:11:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD29B3857731 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id E2FE53858405 for ; Sat, 8 Feb 2025 16:10:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E2FE53858405 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E2FE53858405 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031024; cv=none; b=C7BDrbKlI9Dr14RPWUyWcePjxgKqLPrB5ehGKQkoVh0PJUnyvGbdtKdji+vN66dEvGk2M4KcpcpmH+zXEsW65hLybSbuGBEM1MpRRzH2IzNLzeyRs5V5WvvJ1UcnXYwJRXUBTt0o3BIWLK3+FMM/Pf7nQesUFTw25+o8n9y+Als= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739031024; c=relaxed/simple; bh=g6WlEey/bF47SsLFPcUPg1N1knI7rchsknDZ1IeCArQ=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=kc8gy/itHrZScj7jUBvOwe572j6wqUklN78XXccgFq+4aT9ckGgEDGTjy1TEhNE5HBKpouy9ETCPIcBfZLhF3lgQ+40WuobkvseZ220FpmJOiFJm3yroyG0aXRe10WbQKovozXbOhZ/m4T3FMvgmQI2MguOfN1toaqsTaI1AHOw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E2FE53858405 Received: from noumea.fritz.box (p200300e5cf2b5600c5c897a38f8e068e.dip0.t-ipconnect.de [IPv6:2003:e5:cf2b:5600:c5c8:97a3:8f8e:68e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dilfridge@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 6602C340C57; Sat, 08 Feb 2025 16:10:22 +0000 (UTC) From: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= To: libc-alpha@sourceware.org Cc: =?utf-8?q?Andreas_K=2E_H=C3=BCttel?= Subject: [PATCH v2 2/4] Makefile: Add ld.so.conf with libgcc dir to testroot.pristine Date: Sat, 8 Feb 2025 17:09:02 +0100 Message-ID: <20250208160937.3955501-2-dilfridge@gentoo.org> X-Mailer: git-send-email 2.45.3 In-Reply-To: <20250208160937.3955501-1-dilfridge@gentoo.org> References: <20250208160937.3955501-1-dilfridge@gentoo.org> MIME-Version: 1.0 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, 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~patchwork=sourceware.org@sourceware.org This way, a nonstandard directory within the testroot containing libgcc_s.so can actually be picked up and used during the test runs. Also provide a subdirectory ld.so.conf.d for drop-in configuration Signed-off-by: Andreas K. Hüttel Reviewed-by: Adhemerval Zanella --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 97b4328af8..cb927fb9f9 100644 --- a/Makefile +++ b/Makefile @@ -634,6 +634,11 @@ $(objpfx)testroot.pristine/install.stamp : cp $(objpfx)support/shell-container $(objpfx)testroot.pristine/bin/sh cp $(objpfx)support/echo-container $(objpfx)testroot.pristine/bin/echo cp $(objpfx)support/true-container $(objpfx)testroot.pristine/bin/true + # We need to be able to load extra language libraries. + mkdir -p $(objpfx)testroot.pristine/etc/ld.so.conf.d + echo 'include ld.so.conf.d/*.conf' > $(objpfx)testroot.pristine/etc/ld.so.conf + echo $(gnulib-extralibdir) >> $(objpfx)testroot.pristine/etc/ld.so.conf + echo '# file without content' > $(objpfx)testroot.pristine/etc/ld.so.conf.d/999-empty.conf ifeq ($(run-built-tests),yes) # Copy these DSOs first so we can overwrite them with our own. for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \