[oe-commits] Michael Smith : fastjar 0.98: add non-native recipe

[git version control]

Module: openembedded.git
Branch: martin_jansa/xorg-7.5
Commit: 00993186da6ba1da98aa52464288b15462381290
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=00993186da6ba1da98aa52464288b15462381290

Author: Michael Smith <msmith at cbnco.com>
Date:   Thu Oct 29 05:18:07 2009 +0000

fastjar 0.98: add non-native recipe

Signed-off-by: Michael Smith <msmith at cbnco.com>
Signed-off-by: Henning Heinold <heinold at inf.fu-berlin.de>

---

 recipes/fastjar/fastjar-native.inc     |   12 +-----------
 recipes/fastjar/fastjar-native_0.95.bb |    1 +
 recipes/fastjar/fastjar-native_0.98.bb |    1 +
 recipes/fastjar/fastjar.inc            |   16 ++++++++++++++++
 recipes/fastjar/fastjar_0.98.bb        |    1 +
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/recipes/fastjar/fastjar-native.inc b/recipes/fastjar/fastjar-native.inc
index df4d260..e4d7084 100644
--- a/recipes/fastjar/fastjar-native.inc
+++ b/recipes/fastjar/fastjar-native.inc
@@ -1,18 +1,8 @@
-DESCRIPTION = "jar replacement written in C."
-HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-INC_PR = "r2"
-
 DEPENDS = "zlib-native"
 
-SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz"
-
 S = "${WORKDIR}/fastjar-${PV}"
 
-inherit autotools native
+inherit native
 
 do_configure () {
 	gnu-configize || die "failure running gnu-configize"
diff --git a/recipes/fastjar/fastjar-native_0.95.bb b/recipes/fastjar/fastjar-native_0.95.bb
index 6d2cdb4..342bf7c 100644
--- a/recipes/fastjar/fastjar-native_0.95.bb
+++ b/recipes/fastjar/fastjar-native_0.95.bb
@@ -1,3 +1,4 @@
+require fastjar.inc
 require fastjar-native.inc
 
 PR = "${INC_PR}.1"
diff --git a/recipes/fastjar/fastjar-native_0.98.bb b/recipes/fastjar/fastjar-native_0.98.bb
index 6d2cdb4..342bf7c 100644
--- a/recipes/fastjar/fastjar-native_0.98.bb
+++ b/recipes/fastjar/fastjar-native_0.98.bb
@@ -1,3 +1,4 @@
+require fastjar.inc
 require fastjar-native.inc
 
 PR = "${INC_PR}.1"
diff --git a/recipes/fastjar/fastjar.inc b/recipes/fastjar/fastjar.inc
new file mode 100644
index 0000000..7c5439e
--- /dev/null
+++ b/recipes/fastjar/fastjar.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "jar replacement written in C."
+HOMEPAGE = "http://savannah.nongnu.org/projects/fastjar/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+DEPENDS = "zlib"
+
+INC_PR = "r3"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/fastjar/fastjar-${PV}.tar.gz"
+
+inherit autotools
+
+PACKAGES =+ "${PN}-grepjar"
+FILES_${PN}-grepjar = "${bindir}/grepjar"
diff --git a/recipes/fastjar/fastjar_0.98.bb b/recipes/fastjar/fastjar_0.98.bb
new file mode 100644
index 0000000..35392f2
--- /dev/null
+++ b/recipes/fastjar/fastjar_0.98.bb
@@ -0,0 +1 @@
+require fastjar.inc