diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 10:17:18 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-09-04 10:17:18 +0000 |
| commit | ae63a4dad7b06af132c6ba5bdb5fb98b2231525a (patch) | |
| tree | 62d8fae898721cffb503baa6c43ba795427045b9 /classes | |
| parent | 309c832c2c21ceb97fd589ebce8327d0d2bba731 (diff) | |
| parent | 3c20604cd26ca8da11ac9afb669629c20355c4e4 (diff) | |
merge of '0d3b0d788fccfc1c07e0da07e8f8596c062e2ef2'
and '8a4df13bdb5d6b154edb85a4b71e38ac457670a0'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cmake.bbclass | 3 | ||||
| -rw-r--r-- | classes/gtk-doc.bbclass | 4 | ||||
| -rw-r--r-- | classes/mozilla.bbclass | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass index a9130f2a05..faa4768d90 100644 --- a/classes/cmake.bbclass +++ b/classes/cmake.bbclass @@ -5,7 +5,8 @@ inherit autotools cmake_do_configure() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \ - -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} + -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \ + ${EXTRA_OECMAKE} } EXPORT_FUNCTIONS do_configure diff --git a/classes/gtk-doc.bbclass b/classes/gtk-doc.bbclass new file mode 100644 index 0000000000..58daaf39e2 --- /dev/null +++ b/classes/gtk-doc.bbclass @@ -0,0 +1,4 @@ +# We don't have gtk-doc so disable it +do_configure_prepend() { + echo "EXTRA_DIST=">> ${S}/gtk-doc.make +} diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass index 84c83ebe05..c9a3966709 100644 --- a/classes/mozilla.bbclass +++ b/classes/mozilla.bbclass @@ -38,8 +38,10 @@ mozilla_do_configure() { `dirname $cg`/ done ) - oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ - ${MOZ_OBJDIR}/config.status + if [ -e ${MOZ_OBJDIR}/Makefile ] ; then + oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ + ${MOZ_OBJDIR}/config.status + fi } mozilla_do_compile() { |