[PR PATCH] gcc: remove wrong include-fxed/bits/statx.h header

[PR PATCH] gcc: remove wrong include-fxed/bits/statx.h header

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages gcc-fix
https://github.com/void-linux/void-packages/pull/26488

gcc: remove wrong include-fxed/bits/statx.h header
This is needed, to be able to compile a new gcc with glibc-2.31+


A patch file from https://github.com/void-linux/void-packages/pull/26488.patch is attached

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

From e3d2ec329a88c3820a89e44ad211b69affdab4f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Nov 2020 11:21:42 +0100
Subject: [PATCH] gcc: remove wrong include-fxed/bits/statx.h header

---
 srcpkgs/gcc/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 667818d2c1a..85e761435b4 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=7
+revision=8
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -366,6 +366,12 @@ do_install() {
 		rm -f ${DESTDIR}/usr/lib64
 	fi
 
+	# Remove "fixed" header
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085
+	if [ -e "${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/include-fixed/bits/statx.h" ]; then
+		rm -vrf ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/include-fixed/bits/statx.h
+	fi
+
 	# Remove libffi stuff.
 	rm -f ${DESTDIR}/usr/lib/libffi*
 	rm -f ${DESTDIR}/usr/share/man/man3/ffi*

Re: [PR REVIEW] gcc: remove wrong include-fxed/bits/statx.h header

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26488#discussion_r526347920

Comment:
Does it need the conditional, since you're doing `-f` already?

Re: [PR REVIEW] gcc: remove wrong include-fxed/bits/statx.h header

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/26488#discussion_r526359670

Comment:
Yeah, should be enough. (As is not adding a -r to rm invocation)

Re: [PR PATCH] [Updated] gcc: remove wrong include-fxed/bits/statx.h header

[Johnnynator]

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

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

https://github.com/Johnnynator/void-packages gcc-fix
https://github.com/void-linux/void-packages/pull/26488

gcc: remove wrong include-fxed/bits/statx.h header
This is needed, to be able to compile a new gcc with glibc-2.31+


A patch file from https://github.com/void-linux/void-packages/pull/26488.patch is attached

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

From 9039fd383aeeeb44340df1efe599e583211c247f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 18 Nov 2020 11:21:42 +0100
Subject: [PATCH] gcc: remove wrong include-fixed/bits/statx.h header

---
 srcpkgs/gcc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 667818d2c1a..94e303d58ff 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -8,7 +8,7 @@ _isl_version=0.21
 
 pkgname=gcc
 version=${_minorver}.0
-revision=7
+revision=8
 short_desc="GNU Compiler Collection"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 homepage="http://gcc.gnu.org"
@@ -366,6 +366,10 @@ do_install() {
 		rm -f ${DESTDIR}/usr/lib64
 	fi
 
+	# Remove "fixed" header
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085
+	rm -vf ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/include-fixed/bits/statx.h
+
 	# Remove libffi stuff.
 	rm -f ${DESTDIR}/usr/lib/libffi*
 	rm -f ${DESTDIR}/usr/share/man/man3/ffi*

Re: [PR PATCH] [Merged]: gcc: remove wrong include-fxed/bits/statx.h header

[Johnnynator]

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

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

gcc: remove wrong include-fxed/bits/statx.h header
https://github.com/void-linux/void-packages/pull/26488

Description:
This is needed, to be able to compile a new gcc with glibc-2.31+