On 1/27/25 3:29 AM, Nicolas Schier wrote:
> On Thu, Jan 23, 2025 at 02:19:49AM -0600, Jinghao Jia wrote:
>> Commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from
>> libbpf EXTRA_CFLAGS") fixed the build error caused by redundant include
>> path for samples/bpf, but not samples/hid.
>>
>> Apply the same fix on samples/hid as well.
>>
>> Fixes: 13b25489b6f8 ("kbuild: change working directory to external module directory with M=")
>
> I can't see a relation between this patch and the referenced commit.
> Can you please check whether the 'Fixes' is (still?) valid here?
>
> Kind regards,
> Nicolas
>
The 'Fixes' is from commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary
-I flags from libbpf EXTRA_CFLAGS") that fixes the equivalent issue in
samples/bpf --- according to its commit message, commit 13b25489b6f8
("kbuild: change working directory to external module directory with M=")
is the commit that breaks the libbpf build in the samples.
Best,
Jinghao
>
>> Tested-by: Ruowen Qin <ruqin@xxxxxxxxxx>
>> Signed-off-by: Jinghao Jia <jinghao7@xxxxxxxxxxxx>
>> ---
>> samples/hid/Makefile | 11 ++++++-----
>> 1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/samples/hid/Makefile b/samples/hid/Makefile
>> index 8ea59e9631a3..69159c81d045 100644
>> --- a/samples/hid/Makefile
>> +++ b/samples/hid/Makefile
>> @@ -40,16 +40,17 @@ BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic
>> endif
>> endif
>>
>> -TPROGS_CFLAGS += -Wall -O2
>> -TPROGS_CFLAGS += -Wmissing-prototypes
>> -TPROGS_CFLAGS += -Wstrict-prototypes
>> +COMMON_CFLAGS += -Wall -O2
>> +COMMON_CFLAGS += -Wmissing-prototypes
>> +COMMON_CFLAGS += -Wstrict-prototypes
>>
>> +TPROGS_CFLAGS += $(COMMON_CFLAGS)
>> TPROGS_CFLAGS += -I$(objtree)/usr/include
>> TPROGS_CFLAGS += -I$(LIBBPF_INCLUDE)
>> TPROGS_CFLAGS += -I$(srctree)/tools/include
>>
>> ifdef SYSROOT
>> -TPROGS_CFLAGS += --sysroot=$(SYSROOT)
>> +COMMON_CFLAGS += --sysroot=$(SYSROOT)
>> TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib
>> endif
>>
>> @@ -112,7 +113,7 @@ clean:
>>
>> $(LIBBPF): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUTPUT)
>> # Fix up variables inherited from Kbuild that tools/ build system won't like
>> - $(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \
>> + $(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(COMMON_CFLAGS)" \
>> LDFLAGS=$(TPROGS_LDFLAGS) srctree=$(HID_SAMPLES_PATH)/../../ \
>> O= OUTPUT=$(LIBBPF_OUTPUT)/ DESTDIR=$(LIBBPF_DESTDIR) prefix= \
>> $@ install_headers
>> --
>> 2.48.1
>>
