[PATCH] libpcap: update to 1.10.0

[Hannu Nyman]

Rosen Penev kirjoitti 4.1.2021 klo 10.31:
> On Sun, Jan 3, 2021 at 11:35 PM Bjørn Mork <bjorn at mork.no> wrote:
>> Rosen Penev <rosenp at gmail.com> writes:
>>
>>> ...
>>>
>>> @@ -48,11 +47,15 @@ endef
>>>   CMAKE_OPTIONS += \
>>>        -DBUILD_SHARED_LIBS=ON \
>>>        -DBUILD_WITH_LIBNL=OFF \
>>> +     -DINET6=O$(if $(CONFIG_IPV6),N,FF)
>>>
>>>   # grep 'option(DISABLE_' CMakeLists.txt | cut -f2 -d'(' | cut -f1 -d' ' | sort --unique
>>>   CMAKE_OPTIONS += \
>>> +     -DDISABLE_BLUETOOTH=O$(if $(CONFIG_PCAP_HAS_BT),FF,N) \
>>>        -DDISABLE_DAG=ON \
>>>        -DDISABLE_DBUS=ON \
>>> +     -DDISABLE_DPDK=ON \
>>> +     -DDISABLE_LINUX_USBMON=O$(if $(CONFIG_PCAP_HAS_USB),FF,N) \
>>>        -DDISABLE_NETMAP=ON \
>>>        -DDISABLE_RDMA=ON \
>>>        -DDISABLE_SEPTEL=ON \
>>> @@ -64,12 +67,6 @@ CMAKE_OPTIONS += \
>>>        -DBDEBUG=OFF \
>>>        -DYYDEBUG=OFF \
>>>
>>> -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_USB)       ,,-DDISABLE_USB=ON)
>>> -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_BT)        ,,-DDISABLE_BLUETOOTH=ON)
>>> -CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_NETFILTER) ,,-DPCAP_SUPPORT_NETFILTER=OFF)
>>> -
>>> -CMAKE_OPTIONS += $(if $(CONFIG_IPV6),-DINET6=ON,-DINET6=OFF)
>>> -
>>>   define Build/InstallDev
>>>        $(call Build/InstallDev/cmake,$(1))
>>>        $(SED) \
>>
>>
>> And where did CONFIG_PCAP_HAS_NETFILTER go?
> Oversight. Will add.


Could at the same also remove the unncessary obfuscation of O(N/FF):

+     -DDISABLE_BLUETOOTH=O$(if $(CONFIG_PCAP_HAS_BT),FF,N) \

That ON/OFF optimization for making Makefile one character smaller, makes it 
much harder&cryptic to read.

It would be much easier as

+     -DDISABLE_BLUETOOTH=$(if $(CONFIG_PCAP_HAS_BT),OFF,ON) \

or the original

-CMAKE_OPTIONS += $(if $(CONFIG_PCAP_HAS_BT)        ,,-DDISABLE_BLUETOOTH=ON)