[PR PATCH] gcc6: update template to workaround file-prefix-map

[PR PATCH] gcc6: update template to workaround file-prefix-map

[Johnnynator]

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

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages gcc6
https://github.com/void-linux/void-packages/pull/43224

gcc6: update template to workaround file-prefix-map
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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/43224.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc6-43224.patch --]
[-- Type: text/x-diff, Size: 1492 bytes --]

From 51d852bb595074367cd346334371e9c58f93a2f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 Apr 2023 00:41:41 +0200
Subject: [PATCH] gcc6: update template to workaround file-prefix-map

---
 srcpkgs/gcc6/patches/090-musl.patch | 11 +++++++++++
 srcpkgs/gcc6/template               |  4 ++++
 2 files changed, 15 insertions(+)
 create mode 100644 srcpkgs/gcc6/patches/090-musl.patch

diff --git a/srcpkgs/gcc6/patches/090-musl.patch b/srcpkgs/gcc6/patches/090-musl.patch
new file mode 100644
index 000000000000..4a83ced3c28f
--- /dev/null
+++ b/srcpkgs/gcc6/patches/090-musl.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/i386/i386.c	2023-04-03 00:23:52.367607124 +0200
++++ -	2023-04-03 00:30:12.723657534 +0200
+@@ -8747,7 +8747,7 @@
+ 			 HOST_WIDE_INT words)
+ {
+   int res = 0;
+-  bool error_p = NULL;
++  bool error_p = false;
+ 
+   if (TARGET_IAMCU)
+     {
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 98d46a4126e5..cc65fa8e9826 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -108,6 +108,10 @@ do_configure() {
 	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
 	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
 
+	# file-prefix-map isn't supported in gcc6
+	export CFLAGS="${CFLAGS/-ffile-prefix-map=$wrksrc=./}"
+	export CXXFLAGS="${CXXFLAGS/-ffile-prefix-map=$wrksrc=./}"
+
 	# Disable explicit -fno-PIE, gcc will figure this out itself.
 	export CFLAGS="${CFLAGS//-fno-PIE/}"
 	export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"

Re: [PR PATCH] [Updated] gcc6: update template to workaround file-prefix-map

[Johnnynator]

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

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages gcc6
https://github.com/void-linux/void-packages/pull/43224

gcc6: update template to workaround file-prefix-map
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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/43224.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc6-43224.patch --]
[-- Type: text/x-diff, Size: 2304 bytes --]

From 9a16f581eff487f44658c78be13dcdf177d9fe16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 Apr 2023 00:41:41 +0200
Subject: [PATCH] gcc6: update template to workaround file-prefix-map

---
 .../{patches => files}/303-gcc-6.1-musl-libssp.patch  |  0
 srcpkgs/gcc6/patches/090-musl.patch                   | 11 +++++++++++
 srcpkgs/gcc6/template                                 |  7 +++++++
 3 files changed, 18 insertions(+)
 rename srcpkgs/gcc6/{patches => files}/303-gcc-6.1-musl-libssp.patch (100%)
 create mode 100644 srcpkgs/gcc6/patches/090-musl.patch

diff --git a/srcpkgs/gcc6/patches/303-gcc-6.1-musl-libssp.patch b/srcpkgs/gcc6/files/303-gcc-6.1-musl-libssp.patch
similarity index 100%
rename from srcpkgs/gcc6/patches/303-gcc-6.1-musl-libssp.patch
rename to srcpkgs/gcc6/files/303-gcc-6.1-musl-libssp.patch
diff --git a/srcpkgs/gcc6/patches/090-musl.patch b/srcpkgs/gcc6/patches/090-musl.patch
new file mode 100644
index 000000000000..4a83ced3c28f
--- /dev/null
+++ b/srcpkgs/gcc6/patches/090-musl.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/i386/i386.c	2023-04-03 00:23:52.367607124 +0200
++++ -	2023-04-03 00:30:12.723657534 +0200
+@@ -8747,7 +8747,7 @@
+ 			 HOST_WIDE_INT words)
+ {
+   int res = 0;
+-  bool error_p = NULL;
++  bool error_p = false;
+ 
+   if (TARGET_IAMCU)
+     {
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 98d46a4126e5..d8134b25b21e 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -70,6 +70,9 @@ post_extract() {
 pre_configure() {
 	# _FORTIFY_SOURCE needs an optimization level.
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		patch -p1 -i ${FILESDIR}/303-gcc-6.1-musl-libssp.patch
+	fi
 
 	# old isl normally tries to call aclocal-1.14 to reconfigure itself
 	pushd ${wrksrc}/isl
@@ -108,6 +111,10 @@ do_configure() {
 	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
 	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
 
+	# file-prefix-map isn't supported in gcc6
+	export CFLAGS="${CFLAGS/-ffile-prefix-map=$wrksrc=./}"
+	export CXXFLAGS="${CXXFLAGS/-ffile-prefix-map=$wrksrc=./}"
+
 	# Disable explicit -fno-PIE, gcc will figure this out itself.
 	export CFLAGS="${CFLAGS//-fno-PIE/}"
 	export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"

Re: [PR PATCH] [Updated] gcc6: update template to workaround file-prefix-map

[Johnnynator]

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

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages gcc6
https://github.com/void-linux/void-packages/pull/43224

gcc6: update template to workaround file-prefix-map
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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/43224.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc6-43224.patch --]
[-- Type: text/x-diff, Size: 2332 bytes --]

From 019f76b1e5c4e960f912d4976a582ae6bbd9676c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 3 Apr 2023 00:41:41 +0200
Subject: [PATCH] gcc6: update template to workaround file-prefix-map and
 removed libssp package

---
 .../{patches => files}/303-gcc-6.1-musl-libssp.patch  |  0
 srcpkgs/gcc6/patches/090-musl.patch                   | 11 +++++++++++
 srcpkgs/gcc6/template                                 |  7 +++++++
 3 files changed, 18 insertions(+)
 rename srcpkgs/gcc6/{patches => files}/303-gcc-6.1-musl-libssp.patch (100%)
 create mode 100644 srcpkgs/gcc6/patches/090-musl.patch

diff --git a/srcpkgs/gcc6/patches/303-gcc-6.1-musl-libssp.patch b/srcpkgs/gcc6/files/303-gcc-6.1-musl-libssp.patch
similarity index 100%
rename from srcpkgs/gcc6/patches/303-gcc-6.1-musl-libssp.patch
rename to srcpkgs/gcc6/files/303-gcc-6.1-musl-libssp.patch
diff --git a/srcpkgs/gcc6/patches/090-musl.patch b/srcpkgs/gcc6/patches/090-musl.patch
new file mode 100644
index 000000000000..4a83ced3c28f
--- /dev/null
+++ b/srcpkgs/gcc6/patches/090-musl.patch
@@ -0,0 +1,11 @@
+--- a/gcc/config/i386/i386.c	2023-04-03 00:23:52.367607124 +0200
++++ -	2023-04-03 00:30:12.723657534 +0200
+@@ -8747,7 +8747,7 @@
+ 			 HOST_WIDE_INT words)
+ {
+   int res = 0;
+-  bool error_p = NULL;
++  bool error_p = false;
+ 
+   if (TARGET_IAMCU)
+     {
diff --git a/srcpkgs/gcc6/template b/srcpkgs/gcc6/template
index 98d46a4126e5..d8134b25b21e 100644
--- a/srcpkgs/gcc6/template
+++ b/srcpkgs/gcc6/template
@@ -70,6 +70,9 @@ post_extract() {
 pre_configure() {
 	# _FORTIFY_SOURCE needs an optimization level.
 	sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {gcc,libiberty}/configure
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		patch -p1 -i ${FILESDIR}/303-gcc-6.1-musl-libssp.patch
+	fi
 
 	# old isl normally tries to call aclocal-1.14 to reconfigure itself
 	pushd ${wrksrc}/isl
@@ -108,6 +111,10 @@ do_configure() {
 	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
 	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
 
+	# file-prefix-map isn't supported in gcc6
+	export CFLAGS="${CFLAGS/-ffile-prefix-map=$wrksrc=./}"
+	export CXXFLAGS="${CXXFLAGS/-ffile-prefix-map=$wrksrc=./}"
+
 	# Disable explicit -fno-PIE, gcc will figure this out itself.
 	export CFLAGS="${CFLAGS//-fno-PIE/}"
 	export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"

Re: [PR PATCH] [Merged]: gcc6: update template to workaround file-prefix-map

[Johnnynator]

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

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

gcc6: update template to workaround file-prefix-map
https://github.com/void-linux/void-packages/pull/43224

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### 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
-->