From: Michael Lauer <mickey@vanille-media.de>
Date: Thu, 1 Jun 2006 16:03:31 +0000 (+0000)
Subject: ethereal: remove workaround with -native version, delete -native
X-Git-Tag: Release-2010-05/1~9453^2~1512^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90c860b929380220f25fbb85827d8ce5f12277cd;p=openembedded.git

ethereal: remove workaround with -native version, delete -native
---

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}"
 }
+