From patchwork Fri May 27 16:44:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Linderud X-Patchwork-Id: 2061 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.30) for (single-drop); Fri, 27 May 2022 16:45:02 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id D2SQHw0AkWLLWAYAK+/4rw (envelope-from ) for ; Fri, 27 May 2022 16:45:01 +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 B6C37103E60B; Fri, 27 May 2022 16:44:59 +0000 (UTC) Received: from lists.archlinux.org (localhost [IPv6:::1]) by lists.archlinux.org (Postfix) with ESMTP id 896A3101C779; Fri, 27 May 2022 16:44:59 +0000 (UTC) X-Original-To: pacman-dev@lists.archlinux.org Delivered-To: pacman-dev@lists.archlinux.org Received: from mail.archlinux.org (mail.archlinux.org [IPv6:2a01:4f9:c010:3052::1]) by lists.archlinux.org (Postfix) with ESMTPS id B2A44101C771 for ; Fri, 27 May 2022 16:44:57 +0000 (UTC) From: Morten Linderud DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1653669896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fFhD/Su6JQyCCH5S55TXhSw6fqv5vB28Gzs7fxm3ui8=; b=QA8MP9qRbfO5jxj1eb6AlGdDM8P9ZcOZunxmzVK442K3bdtU+b9JUatRBbSXl3YACw57Fz j4R5CyoVffo0RswX7lfqbWWb+72Ywm4uZhiQRt1/5NkzIYEAnNgShoCvl6KfmvAplfs6/K inYLJ647oT73TPnKfp5QA73oHNviQqHtlEDViAQYiKjX7g0WsgUwcqQD5cLzc7BanQpHSI yuh9zbyIQ3FqcIIEuIopyWaAP0M9xPMZZJNJ1BJ9/MZnxMVTF4RkwaaLzQfNJ7c27ArPe4 TUxmKUneMgYyZBYlcrJ6rADNCsAQSjNmNS+VtBusOK1Op5kfp8/jm46akMsDEM5Mo/Gk5p Z8Vc61+dZcQw6WLtxlUMD5Vk8GGCpRMzADJjz9yZJaCCxYXy0Hvbo6daEwC0PSq7n2IM0p NL+lOh5IB3i6q79PJ1wXAypVelHbcxu69Bas1pq8imFLgz9wAV/Umid5QMkFapiFM7Jvt/ AYO9/iQMIP6nX3sWNuBvgyLMS+zJ3Vuj2nuLVJsn40GU5TbMsD9iY1UgYyEYneGq53/M6s XtFo20VMqG8Kvh19b9d7eOrgTpgWsr6n7sCvZLZMoIngKRg6ngbEXpj+wyTUO7VEtsB1NL p7Oq+5/pcu4xFyLLucSnCI7nedNH7oEsnX2fgKSdkw+Oh+udAYiOM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1653669896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=fFhD/Su6JQyCCH5S55TXhSw6fqv5vB28Gzs7fxm3ui8=; b=6rLdSyDXn8+6tgB9Mq0eZ183CPleIBskN4Jf5gwIZvLSqMFPosbBtqMBNbFlvW0Z6lCarP pjgw/ZiNJZX6J1Bg== To: pacman-dev@lists.archlinux.org Cc: Morten Linderud Subject: [PATCH] debugflags: Ensure we have unique source paths Date: Fri, 27 May 2022 18:44:52 +0200 Message-Id: <20220527164452.1130558-1-foxboron@archlinux.org> X-Mailer: git-send-email 2.36.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=pass header.d=archlinux.org header.s=dkim-rsa header.b=QA8MP9qR; dkim=pass header.d=archlinux.org header.s=dkim-ed25519 header.b=6rLdSyDX; 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; dmarc=pass (policy=none) header.from=archlinux.org X-Rspamd-Server: mail.archlinux.org X-Spamd-Result: default: False [-2.61 / 15.00]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MID_CONTAINS_FROM(1.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; R_MISSING_CHARSET(0.50)[]; RCVD_IN_DNSWL_MED(-0.40)[2a01:4f9:c010:9eb4::1:from,2a01:4f9:c010:3052::1:received]; MAILLIST(-0.20)[mailman]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f9:c010:9eb4::1:c]; R_DKIM_ALLOW(-0.20)[archlinux.org:s=dkim-rsa,archlinux.org:s=dkim-ed25519]; MIME_GOOD(-0.10)[text/plain]; HAS_LIST_UNSUB(-0.01)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[pacman-dev@lists.archlinux.org]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; DKIM_TRACE(0.00)[archlinux.org:+]; RCVD_COUNT_THREE(0.00)[3]; FROM_NEQ_ENVFROM(0.00)[foxboron@archlinux.org,pacman-dev-bounces@lists.archlinux.org]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Queue-Id: B6C37103E60B From: Morten Linderud In some cases packages are built outside of a directory which contains pkgname-pkgver, this results in source listing in debug packages having a conflicting path like `/usr/src/debug/build/` which is not ideal. This patch ensures we always include the pkgbase to ensure the paths are unique. Signed-off-by: Morten Linderud --- scripts/libmakepkg/buildenv/debugflags.sh.in | 6 +++--- scripts/libmakepkg/tidy/strip.sh.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/libmakepkg/buildenv/debugflags.sh.in b/scripts/libmakepkg/buildenv/debugflags.sh.in index 1cb58613..2bdb8b0b 100644 --- a/scripts/libmakepkg/buildenv/debugflags.sh.in +++ b/scripts/libmakepkg/buildenv/debugflags.sh.in @@ -30,9 +30,9 @@ buildenv_functions+=('buildenv_debugflags') buildenv_debugflags() { if check_option "debug" "y" && ! check_option "buildflags" "n"; then - 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}" + DEBUG_CFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" + DEBUG_CXXFLAGS+=" -ffile-prefix-map=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" + DEBUG_RUSTFLAGS+=" --remap-path-prefix=$srcdir=${DBGSRCDIR:-/usr/src/debug}/${pkgbase}" CFLAGS+=" $DEBUG_CFLAGS" CXXFLAGS+=" $DEBUG_CXXFLAGS" RUSTFLAGS+=" $DEBUG_RUSTFLAGS" diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index 688bcf1b..25bc649e 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -47,7 +47,7 @@ source_files() { LANG=C debugedit --no-recompute-build-id \ --base-dir "${srcdir}" \ - --dest-dir "${dbgsrcdir}" \ + --dest-dir "${dbgsrcdir}/${pkgbase}" \ --list-file /dev/stdout "$1" \ | sort -zu | tr '\0' '\n' }