Leo Famulari writes:
> There are conflicts in cross gnu/packages/cross-base.scm when merging
> master (e7806e6ca) into core-updates (f10e7ef47).
>
> These are the commits that are conflicting:
>
> Core-updates: 55de892b4 (gnu: glibc: Rename linux-headers input to
> kernel-headers).
>
> Master: efc4eb147 (gnu: cross: Use CROSS_*_INCLUDE_PATH for system
> headers) and maybe the follow-up typo fix in 0a0884c9 (gnu: cross: Fix
> typo).
>
> I could try to resolve the conflict myself, but I think it's better if
> Jan and Manolis work together, or at least give me some instructions.
I looked into it. If you modify the patch, changing `linux' to
`kernel' except in one place
(define (cross? x)
==>except this line ;; Return #t if X is a cross-libc or cross Linux.
(or (string-prefix? libc x)
(string-prefix? kernel x)))
it applies cleanly. Here's what I did to do that mechanically.
git reset --hard origin/master
git rebase origin/core-updates
...
cp .git/rebase-apply/patch patch
sed -i s/linux/kernel/gi patch
sed -i 's/or cross kernel/or cross Linux/' patch
git reset --hard HEAD
patch -p1 < patch
If I can help any better, please let me know.
Greetings,
Jan
--
Jan Nieuwenhuizen <jann...@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
