summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-10 11:06:19 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-10 11:06:19 +0100
commitd10060c3305a6c1307878f723cd7b28045ed2a2b (patch)
tree5c494b3140b2d45ce733bf81bac6680e7684d839
parenta1830ffaa24befa955c296ad3ab005e04ac37dd9 (diff)
downloadopenembedded-core-d10060c3305a6c1307878f723cd7b28045ed2a2b.tar.gz
openembedded-core-d10060c3305a6c1307878f723cd7b28045ed2a2b.tar.bz2
openembedded-core-d10060c3305a6c1307878f723cd7b28045ed2a2b.zip
gtk-doc: Sync with OE but also convert to use BBCLASSEXTEND with overrides magic
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/gtk-doc/gtk-doc-native.bb11
-rw-r--r--meta/packages/gtk-doc/gtk-doc.bb24
-rw-r--r--meta/packages/gtk-doc/gtk-doc.inc2
3 files changed, 24 insertions, 13 deletions
diff --git a/meta/packages/gtk-doc/gtk-doc-native.bb b/meta/packages/gtk-doc/gtk-doc-native.bb
deleted file mode 100644
index cf3ca9846f..0000000000
--- a/meta/packages/gtk-doc/gtk-doc-native.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "x11/base"
-inherit native
-require gtk-doc.inc
-PR="r1"
-
-SRC_URI = "file://gtk-doc.m4"
-
-do_stage() {
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 ${WORKDIR}/gtk-doc.m4 ${STAGING_DATADIR}/aclocal/
-}
diff --git a/meta/packages/gtk-doc/gtk-doc.bb b/meta/packages/gtk-doc/gtk-doc.bb
new file mode 100644
index 0000000000..8d6a1c814c
--- /dev/null
+++ b/meta/packages/gtk-doc/gtk-doc.bb
@@ -0,0 +1,24 @@
+SECTION = "x11/base"
+SRC_URI = "file://gtk-doc.m4"
+LICENSE = "LGPL"
+PR = "r3"
+
+ALLOW_EMPTY_${PN} = "1"
+
+BBCLASSEXTEND = "native"
+
+do_install () {
+ install -d ${D}/${datadir}/aclocal
+ install -m 0644 ${WORKDIR}/gtk-doc.m4 ${D}/${datadir}/aclocal
+}
+
+do_stage () {
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 ${WORKDIR}/gtk-doc.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+# Standard native.bbclass do_stage() won't work
+do_stage_virtclass-native () {
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 ${WORKDIR}/gtk-doc.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/meta/packages/gtk-doc/gtk-doc.inc b/meta/packages/gtk-doc/gtk-doc.inc
deleted file mode 100644
index 89d831e42c..0000000000
--- a/meta/packages/gtk-doc/gtk-doc.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "LGPL"