[Buildroot] [PATCH 1/3] dbus: don't forcibly disable static builds

[Buildroot] [PATCH 1/3] dbus: don't forcibly disable static builds

[Gustavo Zacarias]

It's there for some historical reason and breaks libpcap with dbus
support for static linkage scenarios (like the one used by tcpreplay).

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/dbus/dbus.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index f8824ee..fc446b1 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -24,7 +24,6 @@ DBUS_CONF_OPT = --with-dbus-user=dbus \
 		--disable-selinux \
 		--disable-xml-docs \
 		--disable-doxygen-docs \
-		--disable-static \
 		--disable-dnotify \
 		--localstatedir=/var \
 		--with-xml=expat \
@@ -90,7 +89,6 @@ HOST_DBUS_CONF_OPT = \
 		--disable-selinux \
 		--disable-xml-docs \
 		--disable-doxygen-docs \
-		--disable-static \
 		--enable-dnotify \
 		--without-x \
 		--with-xml=expat
-- 
1.8.5.5

[Buildroot] [PATCH 2/3] libpcap: make dbus support deterministic

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/libpcap/libpcap.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk
index 3681d4c..10b6cea 100644
--- a/package/libpcap/libpcap.mk
+++ b/package/libpcap/libpcap.mk
@@ -20,6 +20,13 @@ LIBPCAP_CFLAGS = $(TARGET_CFLAGS)
 LIBPCAP_CONF_OPT = --disable-yydebug --with-pcap=linux
 LIBPCAP_CONFIG_SCRIPTS = pcap-config
 
+ifeq ($(BR2_PACKAGE_DBUS),y)
+LIBPCAP_CONF_OPT += --enable-dbus
+LIBPCAP_DEPENDENCIES += dbus
+else
+LIBPCAP_CONF_OPT += --disable-dbus
+endif
+
 ifeq ($(BR2_PACKAGE_LIBUSB),y)
 LIBPCAP_CONF_OPT += --enable-canusb
 LIBPCAP_DEPENDENCIES += libusb
-- 
1.8.5.5

[Buildroot] [PATCH 3/3] tcpreplay: bump to version 4.0.4

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/tcpreplay/tcpreplay.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/package/tcpreplay/tcpreplay.mk b/package/tcpreplay/tcpreplay.mk
index e1ff1f5..2ee224e 100644
--- a/package/tcpreplay/tcpreplay.mk
+++ b/package/tcpreplay/tcpreplay.mk
@@ -4,19 +4,23 @@
 #
 ################################################################################
 
-TCPREPLAY_VERSION = 4.0.3
+TCPREPLAY_VERSION = 4.0.4
 TCPREPLAY_SITE = http://downloads.sourceforge.net/project/tcpreplay/tcpreplay/$(TCPREPLAY_VERSION)
 TCPREPLAY_LICENSE = GPLv3
 TCPREPLAY_LICENSE_FILES = docs/LICENSE
 TCPREPLAY_CONF_ENV = \
 	tr_cv_libpcap_version=">= 0.7.0" \
-	ac_cv_have_bpf=no
+	ac_cv_have_bpf=no \
+	$(call AUTOCONF_AC_CHECK_FILE_VAL,$(STAGING_DIR)/usr/include/pcap-netmap.c)=no
 TCPREPLAY_CONF_OPT = --with-libpcap=$(STAGING_DIR)/usr
 TCPREPLAY_DEPENDENCIES = libpcap
 
-# libpcap may depend on symbols in libusb as well
-TCPREPLAY_LIBS = -lpcap $(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
-TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close='$(TCPREPLAY_LIBS)'
+# libpcap may depend on symbols in libdbus-1 and libusb as well
+TCPREPLAY_LIBS = -lpcap \
+	$(if $(BR2_PACKAGE_DBUS),-ldbus-1) \
+	$(if $(BR2_PACKAGE_LIBUSB),-lusb-1.0)
+TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close='$(TCPREPLAY_LIBS)' \
+	LIBS="$(TCPREPLAY_LIBS)"
 
 ifeq ($(BR2_PACKAGE_TCPDUMP),y)
 TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=/usr/sbin/tcpdump
-- 
1.8.5.5

[Buildroot] [PATCH 1/3] dbus: don't forcibly disable static builds

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > It's there for some historical reason and breaks libpcap with dbus
 > support for static linkage scenarios (like the one used by tcpreplay).

 > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed all 3, thanks.

-- 
Bye, Peter Korsgaard