Re: [PATCH 64/73] acpid: Fix build on musl

Burton, Ross
2016-01-22T12:43:44Z

[-- Attachment #1: Type: text/plain, Size: 872 bytes --]

On 17 January 2016 at 11:36, Khem Raj <raj.khem@gmail.com> wrote:

> implement isfdtype() if libc does not provide it
>
> Fix build when S != B
>
> use top_builddir instead of top_srcdir
>

This and Maxin's upgrade are conflicting:

NOTE: Applying patch '0001-Define-isfdtype-if-libc-doesn-t-have-it.patch'
(../meta/recipes-bsp/acpid/acpid/0001-Define-isfdtype-if-libc-doesn-t-have-it.patch)
ERROR: Command Error: exit status: 1 Output:
Applying patch 0001-Define-isfdtype-if-libc-doesn-t-have-it.patch
patching file configure.ac
Hunk #1 FAILED at 41.
1 out of 1 hunk FAILED -- rejects in file configure.ac
patching file sock.c
Hunk #1 succeeded at 61 with fuzz 2 (offset 11 lines).
Patch 0001-Define-isfdtype-if-libc-doesn-t-have-it.patch does not apply
(enforce with -f)

Can you see if anything else is required beyond Maxin's upgrade?

Ross

[-- Attachment #2: Type: text/html, Size: 1564 bytes --]