From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson
Date: Mon, 29 Aug 2022 05:38:12 +0200 [thread overview]
Message-ID: <20220829033812.T416yu9UYbJ2XfrzejPymryH9aIeOb4p7Rx1rNxtZ1I@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38935@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages debug-prefix-map
https://github.com/void-linux/void-packages/pull/38935
C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson
Both of them build inside a builddir. This change ease the debugging
process.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38935.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-debug-prefix-map-38935.patch --]
[-- Type: text/x-diff, Size: 3044 bytes --]
From e670e34a9a3576e71923d93985e0218ef2af4dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 24 Aug 2022 08:24:03 +0700
Subject: [PATCH 1/2] C{,XX}FLAGS: change -fdebug-prefix-map for cmake and
meson
Both of them build inside a builddir. This change ease the debugging
process.
---
.../configure/debug-debug-prefix-map.sh | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/common/environment/configure/debug-debug-prefix-map.sh b/common/environment/configure/debug-debug-prefix-map.sh
index ca30b61b79ab..b2e187dd407e 100644
--- a/common/environment/configure/debug-debug-prefix-map.sh
+++ b/common/environment/configure/debug-debug-prefix-map.sh
@@ -1,2 +1,13 @@
-CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc=."
-CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc=."
+case "$build_style" in
+cmake)
+ CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc/${cmake_builddir:-build}=."
+ CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc/${cmake_builddir:-build}=."
+ ;;
+meson)
+ CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc/${meson_builddir:-build}=."
+ CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc/${meson_builddir:-build}=."
+ ;;
+*)
+ CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc=."
+ CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc=."
+esac
From 988540d48202beaaf5b1184c8d913954ad0820c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 29 Aug 2022 10:37:16 +0700
Subject: [PATCH 2/2] environment: set -fdebug-prefix-map relative to
build_wrksrc
---
.../configure/debug-debug-prefix-map.sh | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/common/environment/configure/debug-debug-prefix-map.sh b/common/environment/configure/debug-debug-prefix-map.sh
index b2e187dd407e..40b3a7b46bcc 100644
--- a/common/environment/configure/debug-debug-prefix-map.sh
+++ b/common/environment/configure/debug-debug-prefix-map.sh
@@ -1,13 +1,16 @@
+local _wrksrc="$wrksrc${build_wrksrc:+/$build_wrksrc}"
case "$build_style" in
cmake)
- CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc/${cmake_builddir:-build}=."
- CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc/${cmake_builddir:-build}=."
+ CFLAGS="${CFLAGS} -fdebug-prefix-map=$_wrksrc/${cmake_builddir:-build}=."
+ CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$_wrksrc/${cmake_builddir:-build}=."
;;
meson)
- CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc/${meson_builddir:-build}=."
- CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc/${meson_builddir:-build}=."
+ CFLAGS="${CFLAGS} -fdebug-prefix-map=$_wrksrc/${meson_builddir:-build}=."
+ CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$_wrksrc/${meson_builddir:-build}=."
;;
*)
- CFLAGS="${CFLAGS} -fdebug-prefix-map=$wrksrc=."
- CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$wrksrc=."
+ CFLAGS="${CFLAGS} -fdebug-prefix-map=$_wrksrc=."
+ CXXFLAGS="${CXXFLAGS} -fdebug-prefix-map=$_wrksrc=."
esac
+
+unset _wrksrc
next prev parent reply other threads:[~2022-08-29 3:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-27 1:51 [PR PATCH] " sgn
2022-08-29 3:38 ` sgn [this message]
2022-09-18 13:37 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220829033812.T416yu9UYbJ2XfrzejPymryH9aIeOb4p7Rx1rNxtZ1I@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).