diff options
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch index 83fd5129a0..664cea9c75 100644 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From 9b09974003097c9a408bbeea568996768efe705b Mon Sep 17 00:00:00 2001 | 1 | From d3796ad1a19233ee5d3492a5560d7ede882f89cf Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 | 3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 |
4 | Subject: [PATCH 05/10] Tweak gtkdoc settings so that gtkdoc generation works | 4 | Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under |
5 | under OpenEmbedded build system | 5 | OpenEmbedded build system |
6 | 6 | ||
7 | This requires setting a few environment variables so that the transient | 7 | This requires setting a few environment variables so that the transient |
8 | binary is build and linked correctly, and disabling the tweaks to RUN | 8 | binary is build and linked correctly, and disabling the tweaks to RUN |
@@ -12,28 +12,28 @@ Upstream-Status: Inappropriate [oe-specific] | |||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
13 | 13 | ||
14 | --- | 14 | --- |
15 | Source/PlatformGTK.cmake | 2 +- | 15 | Source/cmake/GtkDoc.cmake | 2 +- |
16 | Tools/gtk/gtkdoc.py | 4 ++-- | 16 | Tools/gtkdoc/gtkdoc.py | 4 ++-- |
17 | 2 files changed, 3 insertions(+), 3 deletions(-) | 17 | 2 files changed, 3 insertions(+), 3 deletions(-) |
18 | 18 | ||
19 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake | 19 | diff --git a/Source/cmake/GtkDoc.cmake b/Source/cmake/GtkDoc.cmake |
20 | index 50b5393..7a31db5 100644 | 20 | index 2ee05550..6cb6313d 100644 |
21 | --- a/Source/PlatformGTK.cmake | 21 | --- a/Source/cmake/GtkDoc.cmake |
22 | +++ b/Source/PlatformGTK.cmake | 22 | +++ b/Source/cmake/GtkDoc.cmake |
23 | @@ -24,7 +24,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) | 23 | @@ -4,7 +4,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) |
24 | add_custom_command( | 24 | add_custom_command( |
25 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" | 25 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" |
26 | DEPENDS ${DocumentationDependencies} | 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} | 27 | - 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/gtk/generate-gtkdoc -v ${_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} |
29 | COMMAND touch ${_stamp_name} | 29 | COMMAND touch ${_stamp_name} |
30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | 30 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" |
31 | VERBATIM | 31 | VERBATIM |
32 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py | 32 | diff --git a/Tools/gtkdoc/gtkdoc.py b/Tools/gtkdoc/gtkdoc.py |
33 | index 03c8e8e..34fbaff 100644 | 33 | index 81ee8cdc..3e11c2f0 100644 |
34 | --- a/Tools/gtk/gtkdoc.py | 34 | --- a/Tools/gtkdoc/gtkdoc.py |
35 | +++ b/Tools/gtk/gtkdoc.py | 35 | +++ b/Tools/gtkdoc/gtkdoc.py |
36 | @@ -318,9 +318,9 @@ class GTKDoc(object): | 36 | @@ -317,9 +317,9 @@ class GTKDoc(object): |
37 | additional_ldflags = '%s %s' % (additional_ldflags, arg) | 37 | additional_ldflags = '%s %s' % (additional_ldflags, arg) |
38 | ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags | 38 | ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags |
39 | current_ld_library_path = env.get('LD_LIBRARY_PATH') | 39 | current_ld_library_path = env.get('LD_LIBRARY_PATH') |
@@ -45,6 +45,3 @@ index 03c8e8e..34fbaff 100644 | |||
45 | env['LD_LIBRARY_PATH'] = self.library_path | 45 | env['LD_LIBRARY_PATH'] = self.library_path |
46 | 46 | ||
47 | if ldflags: | 47 | if ldflags: |
48 | -- | ||
49 | 2.15.1 | ||
50 | |||