| Message ID | 24f8f05067f1d4ac201dbda0247ffc7cc521b7b6.1342713965.git.ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass index 58daaf3..6a3854f 100644 --- a/meta/classes/gtk-doc.bbclass +++ b/meta/classes/gtk-doc.bbclass @@ -1,4 +1,16 @@ -# We don't have gtk-doc so disable it -do_configure_prepend() { - echo "EXTRA_DIST=">> ${S}/gtk-doc.make -} +# Helper class to pull in the right gtk-doc dependencies and disable +# gtk-doc. +# +# Long-term it would be great if this class could be toggled between +# gtk-doc-stub-native and the real gtk-doc-native, which would enable +# re-generation of documentation. For now, we'll make do with this which +# packages up any existing documentation (so from tarball builds). + +DEPENDS += "gtk-doc-stub-native" +DEPENDS_virtclass-native += "gtk-doc-stub-native" + +EXTRA_OECONF_append = "\ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ +"
On Thu, 2012-07-19 at 17:10 +0100, Ross Burton wrote: > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/classes/gtk-doc.bbclass | 20 ++++++++++++++++---- > 1 file changed, 16 insertions(+), 4 deletions(-) > > diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass > index 58daaf3..6a3854f 100644 > --- a/meta/classes/gtk-doc.bbclass > +++ b/meta/classes/gtk-doc.bbclass > @@ -1,4 +1,16 @@ > -# We don't have gtk-doc so disable it > -do_configure_prepend() { > - echo "EXTRA_DIST=">> ${S}/gtk-doc.make > -} > +# Helper class to pull in the right gtk-doc dependencies and disable > +# gtk-doc. > +# > +# Long-term it would be great if this class could be toggled between > +# gtk-doc-stub-native and the real gtk-doc-native, which would enable > +# re-generation of documentation. For now, we'll make do with this which > +# packages up any existing documentation (so from tarball builds). > + > +DEPENDS += "gtk-doc-stub-native" > +DEPENDS_virtclass-native += "gtk-doc-stub-native" > + Ok, now I understand why this needs to be an append. Take a recipe like glib which has: DEPENDS = "x" DEPENDS_virtclass-native = "y" Depending on inherit order, DEPENDS_virtclass-native += "gtk-doc-stub-native" may append to DEPENDS_virtclass-native, or it may get overwritten by the direct assignment if that happens second. On the other hand, if you do: DEPENDS_virtclass-native_append = " gtk-doc-stub-native" you stand a better change of getting the behaviour you want as it can't get overwritten. Cheers, Richard
(attempting manual git send-email mojo to avoid sending another huge thread. Sorry if this goes terribly wrong!) Revised patch attached. I've rebased the ross/gtkdoc branch with this commit. Ross
Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/classes/gtk-doc.bbclass | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)