From patchwork Sat Jan 1 13:40:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiretza X-Patchwork-Id: 2000 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [2a01:4f9:c010:3052::1] by patchwork.archlinux.org with IMAP (fetchmail-6.4.25) for (single-drop); Sat, 01 Jan 2022 13:40:35 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id CKqWKtJZ0GEtfwcAK+/4rw (envelope-from ) for ; Sat, 01 Jan 2022 13:40:34 +0000 Received: from lists.archlinux.org (lists.archlinux.org [IPv6:2a01:4f9:c010:9eb4::1]) (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) by mail.archlinux.org (Postfix) with ESMTPS id 0D101BD4612; Sat, 1 Jan 2022 13:40:32 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id B6BF3B5BDE3; Sat, 1 Jan 2022 13:40:31 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.xiretza.xyz (mail.xiretza.xyz [IPv6:2a01:4f8:c2c:17a5::1]) by lists.archlinux.org (Postfix) with ESMTPS id 42A51B5BDD2 for ; Sat, 1 Jan 2022 13:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xiretza.xyz ; s=hetzner; h=Sender:Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=JCUhqZXz2jgjRCXoX8yRsiWDYuMeQmLgTlZ2wfMWWVY=; b=Tu7RYvDnRwQV2JZZSwf895jx1i E7ArAjkw5OKNsxDxFjKU1FSkUTbzMvZZiSOivgbKPiWyQ/+KoawMc9DB7L+kB/mzpSGAyCw+mlAau iQXAbYbMXwTFDACwe5tum1O6YQT36CNZgS6Ri85RSyWNCDi4VucWaZIYRn3pUpNcwIGO7Y/L74tgF JoBA3xO7c/z7QMp05sO9yjEumnefNiYx0Er0qcalCz4rSRz+tTv2Ae99GWVtDx7ow4uPltYfcYRiX ShZhkJm58loRISnhoPUJzYWg3U+fM4R3xstY8QqwsPtQmmcSpjj+XZZt4LGT+VwoqzFxU/8iqfCyj ufaak+ZA==; Received: from [2a01:4f8:201:89ff:d250:99ff:fe80:bb37] (port=39550 helo=zeus.clients.dxld.at) by mail.xiretza.xyz with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1n3ecX-0006Me-3v; Sat, 01 Jan 2022 13:40:29 +0000 From: xiretza+archml@xiretza.xyz To: pacman-dev@lists.archlinux.org Cc: Xiretza Subject: [PATCH] makepkg: use -ffile-prefix-map instead of -fdebug-prefix-map Date: Sat, 1 Jan 2022 14:40:24 +0100 Message-Id: <20220101134024.122031-1-xiretza+archml@xiretza.xyz> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: pacman-dev@lists.archlinux.org X-Mailman-Version: 2.1.39 Precedence: list List-Id: Discussion list for pacman development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-dev-bounces@lists.archlinux.org Sender: "pacman-dev" Authentication-Results: mail.archlinux.org; dkim=fail ("headers rsa verify failed") header.d=xiretza.xyz header.s=hetzner header.b=Tu7RYvDn; dmarc=fail reason="SPF not aligned (relaxed)" header.from=xiretza.xyz (policy=none); spf=pass (mail.archlinux.org: domain of pacman-dev-bounces@lists.archlinux.org designates 2a01:4f9:c010:9eb4::1 as permitted sender) smtp.mailfrom=pacman-dev-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 0D101BD4612 X-Spamd-Result: default: False [0.89 / 15.00]; R_DKIM_REJECT(1.00)[xiretza.xyz:s=hetzner]; R_MISSING_CHARSET(0.50)[]; RCVD_IN_DNSWL_MED(-0.20)[2a01:4f9:c010:9eb4::1:from]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[xiretza.xyz : SPF not aligned (relaxed),none]; HAS_LIST_UNSUB(-0.01)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; ARC_NA(0.00)[]; TAGGED_FROM(0.00)[archml]; FROM_NEQ_ENVFROM(0.00)[xiretza@xiretza.xyz,pacman-dev-bounces@lists.archlinux.org]; FROM_NO_DN(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER_MAILLIST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; RCPT_COUNT_TWO(0.00)[2]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; DKIM_TRACE(0.00)[xiretza.xyz:-]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[] X-Rspamd-Server: mail.archlinux.org From: Xiretza From gcc(1): -ffile-prefix-map=old=new [...] Specifying this option is equivalent to specifying all the individual -f*-prefix-map options. This can be used to make reproducible builds that are location independent. Specifically, this additionally enables -fmacro-prefix-map=, which causes prefix mapping to be applied to expansions of __FILE__ and similar macros. Without this option, if source files are compiled by passing the absolute file path to the compiler (as done by e.g. cmake), any expansions of __FILE__ (e.g. from uses of assert()) will contain $srcdir. --- scripts/libmakepkg/buildenv/debugflags.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 90ddeca0..2efd543a 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -30,8 +30,8 @@ buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { if check_option "debug" "y"; then - DEBUG_CFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" - DEBUG_CXXFLAGS+=" -fdebug-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" + DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}" DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS"