diff options
| -rw-r--r-- | meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch | 36 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/doxygen/doxygen_1.8.14.bb | 17 |
2 files changed, 53 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch new file mode 100644 index 0000000000..0eefe07294 --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | From f3a6c05e3a8afdac547c6c8176fa6b57636db65c Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bartosz Golaszewski <brgl@bgdev.pl> | ||
| 3 | Date: Fri, 23 Nov 2018 11:44:56 +0100 | ||
| 4 | Subject: [PATCH] build: don't look for Iconv | ||
| 5 | |||
| 6 | Drop the find_package() for Iconv. CMake is unable to find iconv.h in | ||
| 7 | native build but all modern systems supply it as part of the standard | ||
| 8 | C library. We don't need this check in meta-openembedded. | ||
| 9 | |||
| 10 | Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> | ||
| 11 | |||
| 12 | Upstream-status: Inappropriate | ||
| 13 | - upstream doxygen must build on many architectures, this change is | ||
| 14 | too intrusive for upstream | ||
| 15 | --- | ||
| 16 | CMakeLists.txt | 4 ---- | ||
| 17 | 1 file changed, 4 deletions(-) | ||
| 18 | |||
| 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 20 | index ba105b89..16252247 100644 | ||
| 21 | --- a/CMakeLists.txt | ||
| 22 | +++ b/CMakeLists.txt | ||
| 23 | @@ -89,10 +89,6 @@ if (sqlite3) | ||
| 24 | find_package(SQLite3 REQUIRED) | ||
| 25 | endif() | ||
| 26 | |||
| 27 | -find_package(Iconv REQUIRED) | ||
| 28 | -include_directories(${ICONV_INCLUDE_DIR}) | ||
| 29 | - | ||
| 30 | - | ||
| 31 | #set(DOXYDOCS ${CMAKE_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") | ||
| 32 | set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) | ||
| 33 | set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) | ||
| 34 | -- | ||
| 35 | 2.19.1 | ||
| 36 | |||
diff --git a/meta-oe/recipes-devtools/doxygen/doxygen_1.8.14.bb b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.14.bb new file mode 100644 index 0000000000..3137c48439 --- /dev/null +++ b/meta-oe/recipes-devtools/doxygen/doxygen_1.8.14.bb | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | DESCRIPTION = "Doxygen is the de facto standard tool for generating documentation from annotated C++ sources." | ||
| 2 | HOMEPAGE = "http://www.doxygen.org/" | ||
| 3 | |||
| 4 | LICENSE = "GPL-2.0" | ||
| 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
| 6 | |||
| 7 | inherit cmake python3native | ||
| 8 | |||
| 9 | DEPENDS = "flex-native bison-native" | ||
| 10 | |||
| 11 | SRC_URI = "ftp://ftp.stack.nl/pub/users/dimitri/doxygen-${PV}.src.tar.gz \ | ||
| 12 | file://0001-build-don-t-look-for-Iconv.patch" | ||
| 13 | |||
| 14 | SRC_URI[md5sum] = "41d8821133e8d8104280030553e2b42b" | ||
| 15 | SRC_URI[sha256sum] = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d" | ||
| 16 | |||
| 17 | BBCLASSEXTEND = "native" | ||
