[Buildroot] [PATCH 1/1] package/llvm-project/clang: update patch to be applied with fuzz 0

[Buildroot] [PATCH 1/1] package/llvm-project/clang: update patch to be applied with fuzz 0

[Bernd Kuhls]

Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.

Due to this change, host-clang fails to build with output:

Applying 0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch using patch:
patching file lib/Driver/ToolChains/Gnu.cpp
Hunk #1 FAILED at 1725.
Hunk #2 succeeded at 2011 (offset 277 lines).
1 out of 2 hunks FAILED -- saving rejects to file lib/Driver/ToolChains/Gnu.cpp.rej

Rebase the patch to fix the problem.

Fixes:
http://autobuild.buildroot.net/results/75b/75baa62275d64c699d9757f7c756fc03ea717877/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...1-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch
index 08371154d5..ffdd5d187f 100644
--- a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch
+++ b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch
@@ -44,7 +44,7 @@ index 2ad45097dc..90d6b5b748 100644
 +++ b/lib/Driver/ToolChains/Gnu.cpp
 @@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init(
  
-     Prefixes.push_back(GCCToolchainDir);
+     Prefixes.push_back(std::string(GCCToolchainDir));
    } else {
 +    StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX;
 +
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/llvm-project/clang: update patch to be applied with fuzz 0

[Yann E. MORIN]

Bernd, All,

On 2024-06-30 17:31 +0200, Bernd Kuhls spake thusly:
> Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
> fuzz factor to 0" reduced the fuzz factor.
> 
> Due to this change, host-clang fails to build with output:
> 
> Applying 0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch using patch:
> patching file lib/Driver/ToolChains/Gnu.cpp
> Hunk #1 FAILED at 1725.
> Hunk #2 succeeded at 2011 (offset 277 lines).
> 1 out of 2 hunks FAILED -- saving rejects to file lib/Driver/ToolChains/Gnu.cpp.rej
> 
> Rebase the patch to fix the problem.
> 
> Fixes:
> http://autobuild.buildroot.net/results/75b/75baa62275d64c699d9757f7c756fc03ea717877/
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...1-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch
> index 08371154d5..ffdd5d187f 100644
> --- a/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch
> +++ b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch
> @@ -44,7 +44,7 @@ index 2ad45097dc..90d6b5b748 100644
>  +++ b/lib/Driver/ToolChains/Gnu.cpp
>  @@ -1725,6 +1725,8 @@ void Generic_GCC::GCCInstallationDetector::init(
>   
> -     Prefixes.push_back(GCCToolchainDir);
> +     Prefixes.push_back(std::string(GCCToolchainDir));
>     } else {
>  +    StringRef GccIinstallPrefix = GCC_INSTALL_PREFIX;
>  +
> -- 
> 2.39.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot