[Buildroot] [PATCH 1/1] package/lsof: drop first and second patches

[Arnout Vandecappelle]

  Pressed send too soon...

  Subject was wrong: it's first and third patches.


On 12/04/2022 20:32, Arnout Vandecappelle wrote:
>
>
> On 05/04/2022 22:55, Fabrice Fontaine wrote:
>> Set LSOF_AR and LSOF_CC to be able to drop first patch which is not
>> upstreamable: https://github.com/lsof-org/lsof/issues/197
>>
>> $(TARGET_CONFIGURE_OPTS) must also be removed to avoid overriding AR
>> and so we can drop LSOF_CFLAGS_OVERRIDE=1 and third patch
>>
>> DEBUG="$(TARGET_CFLAGS)" can also be dropped from LSOF_BUILD_CMDS as it
>> is already set in LSOF_CONFIGURE_CMDS
>>
>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com> 
[snip]
>> diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
>> index ff09d64345..e4e339349a 100644
>> --- a/package/lsof/lsof.mk
>> +++ b/package/lsof/lsof.mk
>> @@ -33,7 +33,8 @@ endif
>>   define LSOF_CONFIGURE_CMDS
>>       (cd $(@D) ; \
>>           echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \
>> -        LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \
>> +        LSOF_AR="$(TARGET_AR) cr" LSOF_CC=$(TARGET_CC) \

  You need to put quotes around TARGET_CC, because it may contain ccache.

  Both fixes were applied before pushing.


  Regards,
  Arnout


>> + LSOF_INCLUDE="$(STAGING_DIR)/usr/include" \
>>           LINUX_CLIB=-DGLIBCV=2 LSOF_CFGL="$(TARGET_LDFLAGS)" \
>>           ./Configure linux)
>>       $(LSOF_CONFIGURE_WCHAR_FIXUPS)
>> @@ -41,7 +42,7 @@ define LSOF_CONFIGURE_CMDS
>>   endef
>>     define LSOF_BUILD_CMDS
>> -    $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) 
>> DEBUG="$(TARGET_CFLAGS)" -C $(@D)
>> +    $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
>>   endef
>>     define LSOF_INSTALL_TARGET_CMDS