diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-oe/recipes-devtools/doxygen | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/doxygen')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch | 36 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb | 16 |
2 files changed, 52 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch new file mode 100644 index 0000000000..c86dc1691e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch @@ -0,0 +1,36 @@ +From 24650b0c7db6b213a2eaa5061b75b9f1b43f1ce9 Mon Sep 17 00:00:00 2001 +From: Bartosz Golaszewski <brgl@bgdev.pl> +Date: Fri, 23 Nov 2018 11:44:56 +0100 +Subject: [PATCH] build: don't look for Iconv + +Drop the find_package() for Iconv. CMake is unable to find iconv.h in +native build but all modern systems supply it as part of the standard +C library. We don't need this check in meta-openembedded. + +Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> + +Upstream-status: Inappropriate +- upstream doxygen must build on many architectures, this change is + too intrusive for upstream +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45c2f2c1..22cf0144 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -92,10 +92,6 @@ if (sqlite3) + endif() + endif() + +-find_package(Iconv REQUIRED) +-include_directories(${ICONV_INCLUDE_DIR}) +- +- + #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") + set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) + set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) +-- +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 new file mode 100644 index 0000000000..7846846202 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." +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 \ + file://0001-build-don-t-look-for-Iconv.patch" +SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3" +SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d" + +BBCLASSEXTEND = "native" |