kakasi: merged native and target recipe, removed legacy staging

not really a beaty; but we have no simple way to specify a
target only patch. This seems the cleanest way to do it

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

diff --git a/recipes/kakasi/kakasi-native_2.3.4.bb b/recipes/kakasi/kakasi-native_2.3.4.bb
deleted file mode 100644 (file)
index 24d4e1d..0000000
--- a/recipes/kakasi/kakasi-native_2.3.4.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require kakasi.inc
-
-inherit native
-
-do_stage() {
-        install src/mkkanwa ${STAGING_BINDIR}
-}
-
-
-
-SRC_URI[md5sum] = "4eff51aafbd56c9635791a20c03efa8f"
-SRC_URI[sha256sum] = "c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534"

diff --git a/recipes/kakasi/kakasi.inc b/recipes/kakasi/kakasi.inc
index b931a84..b893b28 100644 (file)
--- a/recipes/kakasi/kakasi.inc
+++ b/recipes/kakasi/kakasi.inc
@@ -1,8 +1,14 @@
 DESCRIPTION = "Kanji Kana Simple Inverter"
+SECTION = "utils"
 HOMEPAGE = "http://kakasi.namazu.org/"
 LICENSE = "GPL"
 
+INC_PR = "r0"
+
+# the lines below are a little bit yucky but I found no better way to do this
 SRC_URI = "http://kakasi.namazu.org/stable/kakasi-${PV}.tar.gz"
+SRC_URI += "file://makefile.patch"
+SRC_URI_virtclass-native = "http://kakasi.namazu.org/stable/kakasi-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 

diff --git a/recipes/kakasi/kakasi_2.3.4.bb b/recipes/kakasi/kakasi_2.3.4.bb
index 843f6fb..9a269e7 100644 (file)
--- a/recipes/kakasi/kakasi_2.3.4.bb
+++ b/recipes/kakasi/kakasi_2.3.4.bb
@@ -1,17 +1,16 @@
 require kakasi.inc
 
-SECTION = "utils"
 DEPENDS = "kakasi-native"
+DEPENDS_virtclass-native = ""
 
-SRC_URI += "file://makefile.patch"
-
-do_stage () {
-        install -m 0644 lib/*.h ${STAGING_INCDIR}
-       install lib/.libs/libkakasi.so* ${STAGING_LIBDIR}
-}
-
-
-
+PR = "${INC_PR}.1"
 
 SRC_URI[md5sum] = "4eff51aafbd56c9635791a20c03efa8f"
 SRC_URI[sha256sum] = "c272560f5c11fe45b011c4e26ada66218fb0109d5582c5876aa49c5e24718534"
+
+do_install_virtclass-native() {
+        install src/mkkanwa ${STAGING_BINDIR}
+}
+
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"