[oe-commits] [meta-openembedded] 39/42: doxygen: Make it build with ninja 1.9.0

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit a73aade45895086ee905e44b7007afd55798e85b
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Fri Apr 5 23:09:18 2019 +0200

    doxygen: Make it build with ninja 1.9.0
    
    ninja 1.9.0 turned the previous dupbuild warning into an error, which
    resulted in the following error:
    
      ninja: error: build.ninja:1948: multiple rules generate
      generated_src/configvalues.h [-w dupbuild=err]
    
    Turn the error back into a warning until upstream corrects the build
    rules.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb
index 7846846..2435b58 100644
--- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb
+++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb
@@ -4,8 +4,6 @@ HOMEPAGE = "http://www.doxygen.org/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-inherit cmake python3native
-
 DEPENDS = "flex-native bison-native"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
@@ -13,4 +11,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
 SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3"
 SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d"
 
+inherit cmake python3native
+
+# Avoid the following error:
+#   ninja: error: build.ninja:1948: multiple rules generate
+#   generated_src/configvalues.h [-w dupbuild=err]
+EXTRA_OECMAKE_BUILD += "-w dupbuild=warn"
+
 BBCLASSEXTEND = "native"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.