pyrox.dev
1From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001
2From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3Date: Tue, 8 Mar 2016 17:26:23 -0800
4Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
5
6https://bugs.webkit.org/show_bug.cgi?id=152650
7
8Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
9---
10 ChangeLog | 10 ++++++++++
11 Source/PlatformGTK.cmake | 2 +-
12 Source/cmake/OptionsGTK.cmake | 5 -----
13 3 files changed, 11 insertions(+), 6 deletions(-)
14
15diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
16index af4d2e3..0b11b56 100644
17--- a/Source/PlatformGTK.cmake
18+++ b/Source/PlatformGTK.cmake
19@@ -34,7 +34,7 @@ endmacro()
20 add_gtkdoc_generator("docs-build.stamp" "")
21 if (ENABLE_GTKDOC)
22 add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
23-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
24+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
25 add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
26
27 # Add a default build step which check that documentation does not have any warnings
28diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
29index 6b01f1a..b443d10 100644
30--- a/Source/cmake/OptionsGTK.cmake
31+++ b/Source/cmake/OptionsGTK.cmake
32@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
33 set(ENABLE_INTROSPECTION OFF)
34 endif ()
35
36-# Override the cached variable, gtk-doc does not really work when building on Mac.
37-if (APPLE)
38- set(ENABLE_GTKDOC OFF)
39-endif ()
40-
41 set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
42 set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
43 set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
44diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
45index 4c8237b..a628ae0 100644
46--- a/Tools/gtk/gtkdoc.py
47+++ b/Tools/gtk/gtkdoc.py
48@@ -322,6 +322,11 @@ class GTKDoc(object):
49 env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
50 else:
51 env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
52+ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
53+ if current_ld_library_path:
54+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
55+ else:
56+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
57
58 if ldflags:
59 env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
60--
612.7.2
62