diff options
| -rw-r--r-- | eltpatch.in | 2 | ||||
| -rw-r--r-- | patches/color-record/2.4.6 | 27 | ||||
| -rw-r--r-- | patches/color-record/2.4.6-alt | 12 | ||||
| -rw-r--r-- | patches/color-record/2.4.7 | 19 |
4 files changed, 59 insertions, 1 deletions
diff --git a/eltpatch.in b/eltpatch.in index 1e6920d..dfa994f 100644 --- a/eltpatch.in +++ b/eltpatch.in @@ -129,7 +129,7 @@ elibtoolize() { local force="false" local elt_patches=" install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm ppc64le - specs fsanitize fuse-ld static-flags werror cxx-pthread + specs fsanitize fuse-ld static-flags werror cxx-pthread color-record " for x in "$@" ; do diff --git a/patches/color-record/2.4.6 b/patches/color-record/2.4.6 new file mode 100644 index 0000000..7e8ac0c --- /dev/null +++ b/patches/color-record/2.4.6 @@ -0,0 +1,27 @@ +From 64baaf00e93b990154a53a1345be24c9d9bb25c5 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 9 Jan 2024 01:40:56 +0000 +Subject: [PATCH] ltmain.in: Pass through -fdiagnostics-color, + -frecord-gcc-switches + +--- + build-aux/ltmain.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index d5cf07a6..b372dc87 100644 +--- ltmain.in ++++ ltmain.in +@@ -5363,7 +5363,8 @@ func_mode_link () + # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ ++ -fdiagnostics-color*|-frecord-gcc-switches) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" +-- +2.43.0 + diff --git a/patches/color-record/2.4.6-alt b/patches/color-record/2.4.6-alt new file mode 100644 index 0000000..c2e62ef --- /dev/null +++ b/patches/color-record/2.4.6-alt @@ -0,0 +1,12 @@ +--- ltmain.sh.bak 2024-01-09 01:44:40.796693940 +0000 ++++ ltmain.sh 2024-01-09 01:45:13.455072670 +0000 +@@ -7304,7 +7304,8 @@ + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ +- -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Werror|-Werror=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Werror|-Werror=*| \ ++ -fdiagnostics-color*|-frecord-gcc-switches) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" diff --git a/patches/color-record/2.4.7 b/patches/color-record/2.4.7 new file mode 100644 index 0000000..54e0478 --- /dev/null +++ b/patches/color-record/2.4.7 @@ -0,0 +1,19 @@ +--- ltmain.in ++++ ltmain.in +@@ -5405,6 +5405,8 @@ func_mode_link () + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files + # -stdlib=* select c++ std lib with clang ++ # -fdiagnostics-color* simply affects output ++ # -frecord-gcc-switches used to verify flags were respected + # -fsanitize=* Clang/GCC memory and address sanitizer + # -fuse-ld=* Linker select flags for GCC + # -Wa,* Pass flags directly to the assembler +@@ -5412,6 +5414,7 @@ func_mode_link () + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ ++ -fdiagnostics-color*|-frecord-gcc-switches| \ + -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result |