diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-10-29 20:31:17 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-01 17:22:52 -0700 |
commit | bf5d7902321749ecc62dbf5644be5556fbc6de46 (patch) | |
tree | 4b229662ee4718b5fa6056a1ecee2a57888d8b53 /meta-oe/recipes-devtools | |
parent | b66d2391b71b889df70a77d2a6a8d505dcf064e0 (diff) | |
download | meta-openembedded-contrib-bf5d7902321749ecc62dbf5644be5556fbc6de46.tar.gz |
doxygen: Upgrade 1.8.15 -> 1.8.16
Backported patch removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
-rw-r--r-- | meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch | 94 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb (renamed from meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb) | 6 |
2 files changed, 3 insertions, 97 deletions
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch deleted file mode 100644 index bbebc4dc74..0000000000 --- a/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch +++ /dev/null @@ -1,94 +0,0 @@ -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-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb index b49fbd4d02..4df994c751 100644 --- a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb @@ -8,9 +8,9 @@ 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-Fix-6906.patch" -SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3" -SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d" +" +SRC_URI[md5sum] = "3ec5f8bfda38a05845161fbbd5d8b439" +SRC_URI[sha256sum] = "ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82" inherit cmake python3native |