[Buildroot] [PATCH] gcc: bump 6.x series to 6.2.0

Peter Korsgaard peter at korsgaard.com
Mon Aug 22 21:15:35 UTC 2016


>>>>> "Gustavo" == Gustavo Zacarias <gustavo at zacarias.com.ar> writes:

 > Adjust some patches to avoid patching the ChangeLog which isn't quite
 > the same.

 > Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>

Is this against next? It doesn't apply for me:

Applying: gcc: bump 6.x series to 6.2.0
Using index info to reconstruct a base tree...
A       package/gcc/6.1.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
A       package/gcc/6.1.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
A       package/gcc/6.1.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
M       package/gcc/Config.in.host
M       package/gcc/gcc.hash
Falling back to patching base and 3-way merge...
Auto-merging package/gcc/gcc.hash
Auto-merging package/gcc/Config.in.host
CONFLICT (content): Merge conflict in package/gcc/Config.in.host

-- 
Bye, Peter Korsgaard


More information about the buildroot mailing list