summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-09-03 19:38:18 +0000
committerMichael Lauer <mickey@vanille-media.de>2006-09-03 19:38:18 +0000
commita00c3736cc87257bb0fc7feea1463322236c0d4f (patch)
treee776dd4eee6998e6b8ed74c964a87efdbcf2d762 /packages
parent7bca1f212429a1ec73847091de287afdae90dbb6 (diff)
tcpdump: remove 3.8.3; reinstatiate -O2 patch for 3.9.3; remove using local includes
Diffstat (limited to 'packages')
-rw-r--r--packages/tcpdump/tcpdump_3.8.3.bb17
-rw-r--r--packages/tcpdump/tcpdump_3.9.3.bb10
2 files changed, 7 insertions, 20 deletions
diff --git a/packages/tcpdump/tcpdump_3.8.3.bb b/packages/tcpdump/tcpdump_3.8.3.bb
deleted file mode 100644
index f0274b4e86..0000000000
--- a/packages/tcpdump/tcpdump_3.8.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "A sophisticated network protocol dumper"
-HOMEPAGE = "http://www.tcpdump.org/"
-LICENSE = "BSD"
-SECTION = "console/network"
-PRIORITY = "optional"
-DEPENDS = "libpcap-0.8.3"
-PR = "r1"
-
-SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
- file://fix-paths.patch;patch=1"
-
-inherit autotools
-
-do_configure() {
- gnu-configize
- oe_runconf
-}
diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.3.bb
index d3422539ce..2caaa3ab98 100644
--- a/packages/tcpdump/tcpdump_3.9.3.bb
+++ b/packages/tcpdump/tcpdump_3.9.3.bb
@@ -4,14 +4,18 @@ LICENSE = "BSD"
SECTION = "console/network"
PRIORITY = "optional"
DEPENDS = "libpcap-0.9.3 openssl"
-PR = "r0"
+PR = "r1"
-SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz"
+SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
+ file://tcpdump_configure_no_-O2.patch;patch=1"
inherit autotools
+EXTRA_OECONF = "--without-crypto"
+
do_configure() {
gnu-configize
oe_runconf
+ sed -i 's:/usr/lib:${STAGING_LIBDIR}:' ./Makefile
+ sed -i 's:/usr/include:${STAGING_INCDIR}:' ./Makefile
}
-