diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/doxygen')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch | 94 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb | 8 |
2 files changed, 96 insertions, 6 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch new file mode 100644 index 000000000..bbebc4dc7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch @@ -0,0 +1,94 @@ +From 81b213b98f51ec3eed5774f6f797c074ac35db3e Mon Sep 17 00:00:00 2001 +From: Ton van den Heuvel <tonvandenheuvel@gmail.com> +Date: Mon, 6 May 2019 15:17:28 +0200 +Subject: [PATCH] Fix #6906 + +Generate configvalues.h only as a dependency for the VHDL parser. Fixes +a problem in combination with Ninja v1.9.0 because of duplicate rules +for generating configvalues.h. + +Upstream-Status: Backport +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- + addon/doxyapp/CMakeLists.txt | 8 -------- + addon/doxyparse/CMakeLists.txt | 8 -------- + src/CMakeLists.txt | 4 ++++ + vhdlparser/CMakeLists.txt | 12 +++--------- + 4 files changed, 7 insertions(+), 25 deletions(-) + +diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt +index a7377112..0aaf4655 100644 +--- a/addon/doxyapp/CMakeLists.txt ++++ b/addon/doxyapp/CMakeLists.txt +@@ -1,11 +1,3 @@ +-# configvalues.h +-add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h +- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py +- OUTPUT ${GENERATED_SRC}/configvalues.h +-) +-set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +- + find_package(Iconv) + + include_directories( +diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt +index ff198fb4..1620c72e 100644 +--- a/addon/doxyparse/CMakeLists.txt ++++ b/addon/doxyparse/CMakeLists.txt +@@ -1,11 +1,3 @@ +-# configvalues.h +-add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h +- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py +- OUTPUT ${GENERATED_SRC}/configvalues.h +-) +-set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +- + find_package(Iconv) + + include_directories( +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 92a302ab..37a21ff6 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -43,6 +43,10 @@ add_custom_command( + OUTPUT ${GENERATED_SRC}/configvalues.h + ) + set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) ++add_custom_target( ++ generate_configvalues_header ++ DEPENDS ${GENERATED_SRC}/configvalues.h ++) + + # configvalues.cpp + add_custom_command( +diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt +index 71e97df5..f89008c5 100644 +--- a/vhdlparser/CMakeLists.txt ++++ b/vhdlparser/CMakeLists.txt +@@ -1,14 +1,5 @@ +-# configvalues.h +-add_custom_command( +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h +- DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py +- OUTPUT ${GENERATED_SRC}/configvalues.h +-) +-set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1) +- + include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC}) + add_library(vhdlparser STATIC +-${GENERATED_SRC}/configvalues.h + CharStream.cc + ParseException.cc + Token.cc +@@ -17,3 +8,6 @@ VhdlParser.cc + VhdlParserTokenManager.cc + VhdlParserIF.cpp + ) ++add_dependencies(vhdlparser ++ generate_configvalues_header ++) +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb index 2435b587d..b49fbd4d0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb @@ -7,15 +7,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "flex-native bison-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ - file://0001-build-don-t-look-for-Iconv.patch" + file://0001-build-don-t-look-for-Iconv.patch \ + file://0001-Fix-6906.patch" 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" |