From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gcc6: update template to workaround file-prefix-map
Date: Mon, 03 Apr 2023 11:09:24 +0200 [thread overview]
Message-ID: <20230403090924.hH6dSByhhspLUasq1N9q8aiX71m_pzVmp3hsPJIrLuQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-43224@inbox.vuxu.org>
[-- 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/}"
next prev parent reply other threads:[~2023-04-03 9:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-02 22:45 [PR PATCH] " Johnnynator
2023-04-03 8:33 ` [PR PATCH] [Updated] " Johnnynator
2023-04-03 9:09 ` Johnnynator [this message]
2023-04-03 9:09 ` [PR PATCH] [Merged]: " Johnnynator
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=20230403090924.hH6dSByhhspLUasq1N9q8aiX71m_pzVmp3hsPJIrLuQ@z \
--to=johnnynator@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).