1*4882a593SmuzhiyunFrom 1c7e7a385387d7febf633bbb6d2b99ece523e719 Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Alexander Kanavin <alex.kanavin@gmail.com>
3*4882a593SmuzhiyunDate: Thu, 11 Aug 2016 17:13:51 +0300
4*4882a593SmuzhiyunSubject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under
5*4882a593Smuzhiyun OpenEmbedded build system
6*4882a593Smuzhiyun
7*4882a593SmuzhiyunThis requires setting a few environment variables so that the transient
8*4882a593Smuzhiyunbinary is build and linked correctly, and disabling the tweaks to RUN
9*4882a593Smuzhiyunvariable from gtkdoc.py script so that our qemu wrapper is taken into use.
10*4882a593Smuzhiyun
11*4882a593SmuzhiyunUpstream-Status: Inappropriate [oe-specific]
12*4882a593SmuzhiyunSigned-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13*4882a593Smuzhiyun
14*4882a593Smuzhiyun---
15*4882a593Smuzhiyun Source/cmake/GtkDoc.cmake | 2 +-
16*4882a593Smuzhiyun Tools/gtkdoc/gtkdoc.py    | 4 ++--
17*4882a593Smuzhiyun 2 files changed, 3 insertions(+), 3 deletions(-)
18*4882a593Smuzhiyun
19*4882a593Smuzhiyundiff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake
20*4882a593Smuzhiyunindex 18e86448..102c873a 100644
21*4882a593Smuzhiyun--- a/Source/cmake/GtkDoc.cmake
22*4882a593Smuzhiyun+++ b/Source/cmake/GtkDoc.cmake
23*4882a593Smuzhiyun@@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args)
24*4882a593Smuzhiyun     add_custom_command(
25*4882a593Smuzhiyun         OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
26*4882a593Smuzhiyun         DEPENDS ${DocumentationDependencies}
27*4882a593Smuzhiyun-        COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
28*4882a593Smuzhiyun+        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" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
29*4882a593Smuzhiyun         COMMAND touch ${_stamp_name}
30*4882a593Smuzhiyun         WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
31*4882a593Smuzhiyun         VERBATIM
32*4882a593Smuzhiyundiff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py
33*4882a593Smuzhiyunindex 054cafa1..416de7d1 100644
34*4882a593Smuzhiyun--- a/Tools/gtkdoc/gtkdoc.py
35*4882a593Smuzhiyun+++ b/Tools/gtkdoc/gtkdoc.py
36*4882a593Smuzhiyun@@ -320,9 +320,9 @@ class GTKDoc(object):
37*4882a593Smuzhiyun                     additional_ldflags = '%s %s' % (additional_ldflags, arg)
38*4882a593Smuzhiyun             ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
39*4882a593Smuzhiyun             current_ld_library_path = env.get('LD_LIBRARY_PATH')
40*4882a593Smuzhiyun-            if current_ld_library_path:
41*4882a593Smuzhiyun+            if current_ld_library_path and 'RUN' not in env:
42*4882a593Smuzhiyun                 env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
43*4882a593Smuzhiyun-            else:
44*4882a593Smuzhiyun+            elif 'RUN' not in env:
45*4882a593Smuzhiyun                 env['LD_LIBRARY_PATH'] = self.library_path
46*4882a593Smuzhiyun
47*4882a593Smuzhiyun         if ldflags:
48