diff options
Diffstat (limited to 'meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/doxygen/doxygen/0001-build-don-t-look-for-Iconv.patch | 15 |
1 files changed, 8 insertions, 7 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 index 0eefe07294..47c8edb497 100644 --- 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 @@ -1,4 +1,4 @@ -From f3a6c05e3a8afdac547c6c8176fa6b57636db65c Mon Sep 17 00:00:00 2001 +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 @@ -8,8 +8,9 @@ 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> +Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com> -Upstream-status: Inappropriate +Upstream-Status: Inappropriate - upstream doxygen must build on many architectures, this change is too intrusive for upstream --- @@ -17,20 +18,20 @@ Upstream-status: Inappropriate 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ba105b89..16252247 100644 +index 06b9696f..f30b46b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -89,10 +89,6 @@ if (sqlite3) - find_package(SQLite3 REQUIRED) +@@ -117,10 +117,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_SOURCE_DIR}/doc CACHE INTERNAL "Path to doxygen docs") set(DOXYDOCS ${PROJECT_BINARY_DIR}/doc) set(ENV{DOXYGEN_DOCDIR} ${DOXYDOCS}) -- -2.19.1 +2.27.0 |