[PR PATCH] C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson

[PR PATCH] C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1353 bytes --]

There is a new 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: 1360 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] 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

Re: [PR PATCH] [Updated] C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson

[sgn]

[-- 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

Re: [PR PATCH] [Merged]: C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]

There's a merged pull request on the void-packages repository

C{,XX}FLAGS: change -fdebug-prefix-map for cmake and meson
https://github.com/void-linux/void-packages/pull/38935

Description:
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
-->