blob: 664cea9c75933263d67c4621684e4c3dc9732db3 [file] [log] [blame]
Brad Bishopc342db32019-05-15 21:57:59 -04001From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300
Brad Bishopc342db32019-05-15 21:57:59 -04004Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
5 OpenEmbedded build system
Brad Bishop6e60e8b2018-02-01 10:27:11 -05006
7This requires setting a few environment variables so that the transient
8binary is build and linked correctly, and disabling the tweaks to RUN
9variable from gtkdoc.py script so that our qemu wrapper is taken into use.
10
11Upstream-Status: Inappropriate [oe-specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13
14---
Brad Bishopc342db32019-05-15 21:57:59 -040015 Source/cmake/GtkDoc.cmake | 2 +-
16 Tools/gtkdoc/gtkdoc.py | 4 ++--
Brad Bishop6e60e8b2018-02-01 10:27:11 -050017 2 files changed, 3 insertions(+), 3 deletions(-)
18
Brad Bishopc342db32019-05-15 21:57:59 -040019diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
20index 2ee05550..6cb6313d 100644
21--- a/Source/cmake/GtkDoc.cmake
22+++ b/Source/cmake/GtkDoc.cmake
23@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050024 add_custom_command(
25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26 DEPENDS ${DocumentationDependencies}
Brad Bishopc342db32019-05-15 21:57:59 -040027- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
28+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LD=${CMAKE_C_COMPILER}" "LDFLAGS=${CMAKE_C_LINK_FLAGS}" "RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029 COMMAND touch ${_stamp_name}
30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31 VERBATIM
Brad Bishopc342db32019-05-15 21:57:59 -040032diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
33index 81ee8cdc..3e11c2f0 100644
34--- a/Tools/gtkdoc/gtkdoc.py
35+++ b/Tools/gtkdoc/gtkdoc.py
36@@ -317,9 +317,9 @@ class GTKDoc(object):
Brad Bishop6e60e8b2018-02-01 10:27:11 -050037 additional_ldflags = '%s %s' % (additional_ldflags, arg)
38 ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
39 current_ld_library_path = env.get('LD_LIBRARY_PATH')
40- if current_ld_library_path:
41+ if current_ld_library_path and 'RUN' not in env:
42 env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
43- else:
44+ elif 'RUN' not in env:
45 env['LD_LIBRARY_PATH'] = self.library_path
46
47 if ldflags: