blob: 83fd5129a01a2feae6dcdd0f3b2843d85dd61870 [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 11 Aug 2016 17:13:51 +0300
4Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works
5 under OpenEmbedded build system
6
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---
15 Source/PlatformGTK.cmake | 2 +-
16 Tools/gtk/gtkdoc.py | 4 ++--
17 2 files changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
20index 50b5393..7a31db5 100644
21--- a/Source/PlatformGTK.cmake
22+++ b/Source/PlatformGTK.cmake
23@@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
24 add_custom_command(
25 OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26 DEPENDS ${DocumentationDependencies}
27- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtk/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/gtk/generate-gtkdoc -v ${_extra_args}
29 COMMAND touch ${_stamp_name}
30 WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31 VERBATIM
32diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
33index 03c8e8e..34fbaff 100644
34--- a/Tools/gtk/gtkdoc.py
35+++ b/Tools/gtk/gtkdoc.py
36@@ -318,9 +318,9 @@ class GTKDoc(object):
37 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:
48--
492.15.1
50