gtk-doc: Sync with OE but also convert to use BBCLASSEXTEND with overrides magic

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

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"