Changeset 176540 in webkit

Timestamp:

Nov 25, 2014, 6:29:09 AM (12 years ago)

Author:

berto@igalia.com

Message:

[GTK] Use LD_LIBRARY_PATH to make g-ir-scanner use the newly-built
version of libraries when running the temporary executable
​https://bugs.webkit.org/show_bug.cgi?id=138833

Patch by Ting-Wei Lan <Ting-Wei Lan> on 2014-11-25
Reviewed by Carlos Garcia Campos.

This patch modifies LD_LIBRARY_PATH to make sure the dynamic linker
find the correct version of libraries when running the temporary
executable to generate the .gir file.

• PlatformGTK.cmake:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-25  Ting-Wei Lan  <lantw44@gmail.com>
+
+        [GTK] Use LD_LIBRARY_PATH to make g-ir-scanner use the newly-built
+        version of libraries when running the temporary executable
+        https://bugs.webkit.org/show_bug.cgi?id=138833
+
+        Reviewed by Carlos Garcia Campos.
+
+        This patch modifies LD_LIBRARY_PATH to make sure the dynamic linker
+        find the correct version of libraries when running the temporary
+        executable to generate the .gir file.
+
+        * PlatformGTK.cmake:
+
 2014-11-25  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -733 +733 @@
 add_webkit2_prefix_header(webkit2gtkinjectedbundle)
 
+# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
+string(COMPARE EQUAL "$ENV{LD_LIBRARY_PATH}" "" ld_library_path_not_exist)
+if (ld_library_path_does_not_exist)
+    set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
+        "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+    )
+else ()
+    set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
+        "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}"
+    )
+endif ()
+
 add_custom_command(
     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -738 +750 @@
     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
+        LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
         ${INTROSPECTION_SCANNER}
         --quiet
@@ -776 +789 @@
     DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
+        LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
         ${INTROSPECTION_SCANNER}
         --quiet