diff options
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r-- | meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | 49 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.12.5.bb | 5 |
2 files changed, 52 insertions, 2 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch b/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch new file mode 100644 index 0000000000..586dd2375c --- /dev/null +++ b/meta/recipes-sato/webkit/files/0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 4eeeaec775e190cf3f5885d7c6717acebd0201a8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 11 Aug 2016 17:13:51 +0300 | ||
4 | Subject: [PATCH] Tweak gtkdoc settings so that gtkdoc generation works under | ||
5 | OpenEmbedded build system | ||
6 | |||
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 | ||
9 | variable from gtkdoc.py script so that our qemu wrapper is taken into use. | ||
10 | |||
11 | Upstream-Status: Inappropriate [oe-specific] | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | Source/PlatformGTK.cmake | 2 +- | ||
15 | Tools/gtk/gtkdoc.py | 4 ++-- | ||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake | ||
19 | index af4d2e3..b7b93c7 100644 | ||
20 | --- a/Source/PlatformGTK.cmake | ||
21 | +++ b/Source/PlatformGTK.cmake | ||
22 | @@ -25,7 +25,7 @@ macro(ADD_GTKDOC_GENERATOR _stamp_name _extra_args) | ||
23 | add_custom_command( | ||
24 | OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}" | ||
25 | DEPENDS ${DocumentationDependencies} | ||
26 | - COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} | ||
27 | + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=${CMAKE_C_FLAGS} LD=${CMAKE_C_COMPILER} LDFLAGS=${CMAKE_C_LINK_FLAGS} RUN=${CMAKE_BINARY_DIR}/gtkdoc-qemuwrapper GIR_EXTRA_LIBS_PATH=${CMAKE_BINARY_DIR}/lib ${CMAKE_SOURCE_DIR}/Tools/gtk/generate-gtkdoc ${_extra_args} | ||
28 | COMMAND touch ${_stamp_name} | ||
29 | WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" | ||
30 | ) | ||
31 | diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py | ||
32 | index 4c8237b..c0205f0 100644 | ||
33 | --- a/Tools/gtk/gtkdoc.py | ||
34 | +++ b/Tools/gtk/gtkdoc.py | ||
35 | @@ -318,9 +318,9 @@ class GTKDoc(object): | ||
36 | additional_ldflags = '%s %s' % (additional_ldflags, arg) | ||
37 | ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags | ||
38 | current_ld_library_path = env.get('LD_LIBRARY_PATH') | ||
39 | - if current_ld_library_path: | ||
40 | + if current_ld_library_path and 'RUN' not in env: | ||
41 | env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path) | ||
42 | - else: | ||
43 | + elif 'RUN' not in env: | ||
44 | env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path | ||
45 | |||
46 | if ldflags: | ||
47 | -- | ||
48 | 2.8.1 | ||
49 | |||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb index 57ac35f372..bb57239c1d 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.12.5.bb | |||
@@ -19,11 +19,12 @@ SRC_URI = "\ | |||
19 | file://musl-fixes.patch \ | 19 | file://musl-fixes.patch \ |
20 | file://ppc-musl-fix.patch \ | 20 | file://ppc-musl-fix.patch \ |
21 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ | 21 | file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ |
22 | file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ | ||
22 | " | 23 | " |
23 | SRC_URI[md5sum] = "7a9ea00ec195488db90fdeb2d174ddaf" | 24 | SRC_URI[md5sum] = "7a9ea00ec195488db90fdeb2d174ddaf" |
24 | SRC_URI[sha256sum] = "6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40" | 25 | SRC_URI[sha256sum] = "6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40" |
25 | 26 | ||
26 | inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even | 27 | inherit cmake lib_package pkgconfig gobject-introspection perlnative distro_features_check upstream-version-is-even gtk-doc |
27 | 28 | ||
28 | # We cannot inherit pythonnative because that would conflict with inheriting python3native | 29 | # We cannot inherit pythonnative because that would conflict with inheriting python3native |
29 | # (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary | 30 | # (which is done by gobject-introspection). But webkit only needs the path to native Python 2.x binary |
@@ -60,7 +61,7 @@ EXTRA_OECMAKE = " \ | |||
60 | -DPORT=GTK \ | 61 | -DPORT=GTK \ |
61 | -DCMAKE_BUILD_TYPE=Release \ | 62 | -DCMAKE_BUILD_TYPE=Release \ |
62 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ | 63 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ |
63 | -DENABLE_GTKDOC=OFF \ | 64 | ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '-DENABLE_GTKDOC=ON', '-DENABLE_GTKDOC=OFF', d)} \ |
64 | -DENABLE_MINIBROWSER=ON \ | 65 | -DENABLE_MINIBROWSER=ON \ |
65 | " | 66 | " |
66 | 67 | ||