mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@db180c0
This commit is contained in:
TriForceX
@@ -0,0 +1,76 @@
|
||||
From acee9c0c46f71f1f4c33c2dadf69d19e24b90f27 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 13 Aug 2019 20:19:23 +0200
|
||||
Subject: [PATCH] configure.ac: fix --without-libdnet
|
||||
|
||||
Allow the user to disable libdnet check through --without-libdnet.
|
||||
This option is useful to cross-compile tcpreplay to avoid build failures
|
||||
if libdnet is installed on host but not on target, see
|
||||
https://bugs.buildroot.org/show_bug.cgi?id=12096
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/appneta/tcpreplay/pull/567]
|
||||
---
|
||||
configure.ac | 48 +++++++++++++++++++++++++-----------------------
|
||||
1 file changed, 25 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 39ba58b7..5de3dcb5 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1464,30 +1464,32 @@ if test $have_cygwin = no ; then
|
||||
AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]),
|
||||
[trydnetdir=$withval])
|
||||
|
||||
- case "$build_os" in
|
||||
- linux*)
|
||||
- dnl # Debian/Ubuntu already have a package called libdnet
|
||||
- dnl # so you the package you want to install libdumbnet-dev
|
||||
- for testdir in $trydnetdir /usr/local /opt/local /usr ; do
|
||||
- if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then
|
||||
- LDNETINC="$($testdir/bin/dumbnet-config --cflags)"
|
||||
- LDNETLIB="$($testdir/bin/dumbnet-config --libs)"
|
||||
- libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)"
|
||||
- founddnet=$testdir
|
||||
- fi
|
||||
- done
|
||||
- ;;
|
||||
- esac
|
||||
+ if test $trydnetdir != no; then
|
||||
+ case "$build_os" in
|
||||
+ linux*)
|
||||
+ dnl # Debian/Ubuntu already have a package called libdnet
|
||||
+ dnl # so you the package you want to install libdumbnet-dev
|
||||
+ for testdir in $trydnetdir /usr/local /opt/local /usr ; do
|
||||
+ if test -x ${testdir}/bin/dumbnet-config -a $founddnet = no ; then
|
||||
+ LDNETINC="$($testdir/bin/dumbnet-config --cflags)"
|
||||
+ LDNETLIB="$($testdir/bin/dumbnet-config --libs)"
|
||||
+ libdnet_version="$($testdir/bin/dumbnet-config --version) (libdumbnet)"
|
||||
+ founddnet=$testdir
|
||||
+ fi
|
||||
+ done
|
||||
+ ;;
|
||||
+ esac
|
||||
|
||||
- if test $founddnet = no ; then
|
||||
- for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do
|
||||
- if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then
|
||||
- LDNETINC="$($testdir/bin/dnet-config --cflags)"
|
||||
- LDNETLIB="$($testdir/bin/dnet-config --libs)"
|
||||
- libdnet_version="$($testdir/bin/dnet-config --version)"
|
||||
- founddnet=$testdir
|
||||
- fi
|
||||
- done
|
||||
+ if test $founddnet = no ; then
|
||||
+ for testdir in $trydnetdir /usr/local /opt/local $MACOSX_SDK_PATH/usr /usr ; do
|
||||
+ if test -x ${testdir}/bin/dnet-config -a $founddnet = no ; then
|
||||
+ LDNETINC="$($testdir/bin/dnet-config --cflags)"
|
||||
+ LDNETLIB="$($testdir/bin/dnet-config --libs)"
|
||||
+ libdnet_version="$($testdir/bin/dnet-config --version)"
|
||||
+ founddnet=$testdir
|
||||
+ fi
|
||||
+ done
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if test $founddnet = no ; then
|
||||
9
package/tcpreplay/Config.in
Normal file
9
package/tcpreplay/Config.in
Normal file
@@ -0,0 +1,9 @@
|
||||
config BR2_PACKAGE_TCPREPLAY
|
||||
bool "tcpreplay"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBPCAP
|
||||
help
|
||||
Tcpreplay is a tool for replaying network traffic from files
|
||||
saved with tcpdump or other tools which write pcap(3) files.
|
||||
|
||||
http://tcpreplay.appneta.com/
|
||||
5
package/tcpreplay/tcpreplay.hash
Normal file
5
package/tcpreplay/tcpreplay.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://github.com/appneta/tcpreplay/releases/download/v4.3.2/tcpreplay-4.3.2.tar.xz.asc
|
||||
# using key 84E4FA215C934A7D97DC76D5E9E2149793BDE17E
|
||||
sha256 955aed6a40f49a5b8c1234fd0a928edc5c665d94b7755ab5769c30938e33f380 tcpreplay-4.3.2.tar.xz
|
||||
sha256 5971b0c544622f4b210a9cc56436a970685d3b0666e373c09e3cf9304db15d05 docs/LICENSE
|
||||
38
package/tcpreplay/tcpreplay.mk
Normal file
38
package/tcpreplay/tcpreplay.mk
Normal file
@@ -0,0 +1,38 @@
|
||||
################################################################################
|
||||
#
|
||||
# tcpreplay
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TCPREPLAY_VERSION = 4.3.2
|
||||
TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
|
||||
TCPREPLAY_SOURCE = tcpreplay-$(TCPREPLAY_VERSION).tar.xz
|
||||
TCPREPLAY_LICENSE = GPL-3.0
|
||||
TCPREPLAY_LICENSE_FILES = docs/LICENSE
|
||||
TCPREPLAY_CONF_ENV = \
|
||||
ac_cv_path_ac_pt_PCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config"
|
||||
TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr \
|
||||
--enable-pcapconfig
|
||||
TCPREPLAY_DEPENDENCIES = libpcap
|
||||
# We're patching configure.ac
|
||||
TCPREPLAY_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no
|
||||
TCPREPLAY_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDNET),y)
|
||||
TCPREPLAY_DEPENDENCIES += libdnet
|
||||
TCPREPLAY_CONF_OPTS += --with-libdnet=$(STAGING_DIR)/usr
|
||||
else
|
||||
TCPREPLAY_CONF_OPTS += --without-libdnet
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TCPDUMP),y)
|
||||
TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=/usr/sbin/tcpdump
|
||||
else
|
||||
TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=no
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user