[oe] [meta-oe][PATCH 3/6] doxygen: new native package

Khem Raj raj.khem at gmail.com
Sat Nov 24 06:21:19 UTC 2018


I think its better to have doxygen for target as well. So probably use
bbclassextend for native see

http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/tree/recipes-devtools/doxygen/doxygen_1.8.9.1.bb?h=master

Once you merge the changes from this into your patch. Also send a
patch to meta-ti to remove it,

On Fri, Nov 23, 2018 at 7:39 AM Bartosz Golaszewski <brgl at bgdev.pl> wrote:
>
> Doxygen binary is necessary to generate C++ bindings for libsigrok.
>
> We're adding this as a native-only package since it's very unlikely
> it would be needed on any target.
>
> Signed-off-by: Bartosz Golaszewski <brgl at bgdev.pl>
> ---
>  .../doxygen/doxygen-native_1.8.14.bb          | 15 ++++++++
>  .../0001-build-don-t-look-for-Iconv.patch     | 36 +++++++++++++++++++
>  2 files changed, 51 insertions(+)
>  create mode 100644 meta-oe/recipes-devtools/doxygen/doxygen-native_1.8.14.bb
>  create mode 100644 meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
>
> diff --git a/meta-oe/recipes-devtools/doxygen/doxygen-native_1.8.14.bb b/meta-oe/recipes-devtools/doxygen/doxygen-native_1.8.14.bb
> new file mode 100644
> index 000000000..38157085e
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/doxygen/doxygen-native_1.8.14.bb
> @@ -0,0 +1,15 @@
> +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 native
> +
> +DEPENDS = "flex-native bison-native"
> +
> +SRC_URI = "ftp://ftp.stack.nl/pub/users/dimitri/doxygen-${PV}.src.tar.gz \
> +           file://0001-build-don-t-look-for-Iconv.patch"
> +
> +SRC_URI[md5sum] = "41d8821133e8d8104280030553e2b42b"
> +SRC_URI[sha256sum] = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d"
> 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 000000000..0eefe0729
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch
> @@ -0,0 +1,36 @@
> +From f3a6c05e3a8afdac547c6c8176fa6b57636db65c Mon Sep 17 00:00:00 2001
> +From: Bartosz Golaszewski <brgl at 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 at 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 ba105b89..16252247 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -89,10 +89,6 @@ if (sqlite3)
> +     find_package(SQLite3 REQUIRED)
> + 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.19.1
> +
> --
> 2.19.1
>


More information about the Openembedded-devel mailing list