mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/libpcap: bump to version 1.10.0

Browse Source 
configure script now uses pkg-config. Add host-pkgconf dependency.

pkg-config should provide necessary info for libnl build/link. Don't
pass paths to configure.

Add --without-dpdk to make sure we don't link with host installed
libraries.

Format hashes with two space delimiters.

Use https for SITE to save redirect.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach
2021-01-21 19:16:03 +02:00
committed by Peter Korsgaard
parent ac7a7c308c
commit 34708006e2
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/libpcap/libpcap.hash
View File

@@ -1,5 +1,6 @@
# Locally calculated after checking pgp signature # Locally calculated after checking pgp signature
sha256 635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094 libpcap-1.9.1.tar.gz # https://www.tcpdump.org/release/libpcap-1.10.0.tar.gz.sig
sha256 8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e libpcap-1.10.0.tar.gz
# Hash for license file: # Hash for license file:
sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE

12
package/libpcap/libpcap.mk
View File

@@ -4,19 +4,20 @@
# #
################################################################################ ################################################################################
LIBPCAP_VERSION = 1.9.1 LIBPCAP_VERSION = 1.10.0
LIBPCAP_SITE = http://www.tcpdump.org/release LIBPCAP_SITE = https://www.tcpdump.org/release
LIBPCAP_LICENSE = BSD-3-Clause LIBPCAP_LICENSE = BSD-3-Clause
LIBPCAP_LICENSE_FILES = LICENSE LIBPCAP_LICENSE_FILES = LICENSE
LIBPCAP_CPE_ID_VENDOR = tcpdump LIBPCAP_CPE_ID_VENDOR = tcpdump
LIBPCAP_INSTALL_STAGING = YES LIBPCAP_INSTALL_STAGING = YES
LIBPCAP_DEPENDENCIES = host-flex host-bison LIBPCAP_DEPENDENCIES = host-flex host-bison host-pkgconf
LIBPCAP_CONF_ENV = \ LIBPCAP_CONF_ENV = \
ac_cv_header_linux_wireless_h=yes \ ac_cv_header_linux_wireless_h=yes \
CFLAGS="$(LIBPCAP_CFLAGS)" CFLAGS="$(LIBPCAP_CFLAGS)"
LIBPCAP_CFLAGS = $(TARGET_CFLAGS) LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag \
--without-dpdk
# Disable dbus to break recursive dependencies # Disable dbus to break recursive dependencies
LIBPCAP_CONF_OPTS += --disable-dbus LIBPCAP_CONF_OPTS += --disable-dbus
LIBPCAP_CONFIG_SCRIPTS = pcap-config LIBPCAP_CONFIG_SCRIPTS = pcap-config
@@ -35,8 +36,7 @@ endif
ifeq ($(BR2_PACKAGE_LIBNL),y) ifeq ($(BR2_PACKAGE_LIBNL),y)
LIBPCAP_DEPENDENCIES += libnl LIBPCAP_DEPENDENCIES += libnl
LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" LIBPCAP_CONF_OPTS += --with-libnl
LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr
else else
LIBPCAP_CONF_OPTS += --without-libnl LIBPCAP_CONF_OPTS += --without-libnl
endif endif