| 1 |
commit: dde8c3f4bdcec2a7435f88a047615991bc474d04 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 13 07:03:21 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 13 07:19:59 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde8c3f4 |
| 7 |
|
| 8 |
dev-util/mingw64-toolchain: fix direct objdump call |
| 9 |
|
| 10 |
Cherry pick from Gentoo's gcc patches. Ideally don't want to |
| 11 |
carry/follow the full set given they do not really affect this |
| 12 |
(features are disabled, or irrelevant with mingw target), but |
| 13 |
this one does. |
| 14 |
|
| 15 |
Turns out plugin is silently skipped entirely if objdump is missing. |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/843989 |
| 18 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 19 |
|
| 20 |
.../files/gcc-11.3.0-plugin-objdump.patch | 22 ++++++++++++++++++++++ |
| 21 |
.../mingw64-toolchain-10.0.0.ebuild | 1 + |
| 22 |
2 files changed, 23 insertions(+) |
| 23 |
|
| 24 |
diff --git a/dev-util/mingw64-toolchain/files/gcc-11.3.0-plugin-objdump.patch b/dev-util/mingw64-toolchain/files/gcc-11.3.0-plugin-objdump.patch |
| 25 |
new file mode 100644 |
| 26 |
index 000000000000..1de712de48bc |
| 27 |
--- /dev/null |
| 28 |
+++ b/dev-util/mingw64-toolchain/files/gcc-11.3.0-plugin-objdump.patch |
| 29 |
@@ -0,0 +1,22 @@ |
| 30 |
+https://gcc.gnu.org/PR95648 |
| 31 |
+--- a/gcc/config/gcc-plugin.m4 |
| 32 |
++++ b/gcc/config/gcc-plugin.m4 |
| 33 |
+@@ -47,3 +47,3 @@ |
| 34 |
+ if test x$build = x$host; then |
| 35 |
+- export_sym_check="objdump${exeext} -T" |
| 36 |
++ export_sym_check="$ac_cv_prog_OBJDUMP -T" |
| 37 |
+ elif test x$host = x$target; then |
| 38 |
+--- a/gcc/gcc/configure |
| 39 |
++++ b/gcc/gcc/configure |
| 40 |
+@@ -32069,3 +32069,3 @@ |
| 41 |
+ if test x$build = x$host; then |
| 42 |
+- export_sym_check="objdump${exeext} -T" |
| 43 |
++ export_sym_check="$ac_cv_prog_OBJDUMP -T" |
| 44 |
+ elif test x$host = x$target; then |
| 45 |
+--- a/gcc/libcc1/configure |
| 46 |
++++ b/gcc/libcc1/configure |
| 47 |
+@@ -15017,3 +15017,3 @@ |
| 48 |
+ if test x$build = x$host; then |
| 49 |
+- export_sym_check="objdump${exeext} -T" |
| 50 |
++ export_sym_check="$ac_cv_prog_OBJDUMP -T" |
| 51 |
+ elif test x$host = x$target; then |
| 52 |
|
| 53 |
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild |
| 54 |
index 4df5573bc1e4..13b92a3c573c 100644 |
| 55 |
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild |
| 56 |
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild |
| 57 |
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}" |
| 58 |
|
| 59 |
PATCHES=( |
| 60 |
"${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch |
| 61 |
+ "${FILESDIR}"/gcc-11.3.0-plugin-objdump.patch |
| 62 |
) |
| 63 |
|
| 64 |
pkg_pretend() { |
Archives