summaryrefslogtreecommitdiff
path: root/packages/ethereal
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-06-01 16:03:31 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-01 16:03:31 +0000
commit90c860b929380220f25fbb85827d8ce5f12277cd (patch)
tree02c82e4c6f3346e5d46514a457445e4d1743c79b /packages/ethereal
parentf1255d9d6e9c01c3641c563ecc34024b4f691c27 (diff)
ethereal: remove workaround with -native version, delete -native
Diffstat (limited to 'packages/ethereal')
-rw-r--r--packages/ethereal/ethereal-native_0.99.0.bb23
-rw-r--r--packages/ethereal/ethereal_0.99.0.bb9
2 files changed, 5 insertions, 27 deletions
diff --git a/packages/ethereal/ethereal-native_0.99.0.bb b/packages/ethereal/ethereal-native_0.99.0.bb
deleted file mode 100644
index b5e0c589ed..0000000000
--- a/packages/ethereal/ethereal-native_0.99.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require ethereal_${PV}.bb
-DEPENDS = "perl-native libpcap-native"
-inherit native
-
-EXTRA_OECONF = "\
- --enable-ethereal=no \
- --enable-tethereal=yes \
- --enable-editcap=no \
- --enable-dumpcap=no \
- --enable-capinfos=no \
- --enable-mergecap=no \
- --enable-text2pcap=no \
- --enable-idl2eth=no"
-
-do_stage() {
- install -m 0755 rdps ${STAGING_BINDIR}/ethereal-rdps
- install -m 0755 tools/lemon/lemon ${STAGING_BINDIR}/ethereal-lemon
-}
-
-do_install() {
- :
-}
-
diff --git a/packages/ethereal/ethereal_0.99.0.bb b/packages/ethereal/ethereal_0.99.0.bb
index 96e121a3a7..1c46e432d5 100644
--- a/packages/ethereal/ethereal_0.99.0.bb
+++ b/packages/ethereal/ethereal_0.99.0.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Ethereal is the world's most popular network protocol analyzer"
HOMEPAGE = "http://www.ethereal.com"
SECTION = "x11/network"
LICENSE = "GPL"
+DEPENDS = "perl-native gtk+ gnutls libpcap"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-
-DEPENDS = "perl-native ethereal-native gtk+ libpcap"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/ethereal/ethereal-${PV}.tar.bz2 \
file://use-our-lemon.patch;patch=1"
@@ -13,6 +13,7 @@ S = "${WORKDIR}/ethereal-${PV}"
inherit autotools
do_compile_prepend() {
- ln -sf ${STAGING_BINDIR}/ethereal-rdps rdps
- ln -sf ${STAGING_BINDIR}/ethereal-lemon tools/lemon/lemon
+ ${BUILD_CC} ${BUILD_CFLAGS} -o rdps rdps.c
+ oe_runmake -C tools/lemon CC="${BUILD_CC} ${BUILD_CFLAGS}"
}
+