Changeset 177016 in webkit

Timestamp:

Dec 9, 2014 2:20:27 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] LDFLAGS is ignored when running g-ir-scanner
​https://bugs.webkit.org/show_bug.cgi?id=138832

Patch by Ting-Wei Lan <Ting-Wei Lan> on 2014-12-09
Reviewed by Carlos Garcia Campos.

GTK+ requires libintl on FreeBSD because there is no gettext
implementation in FreeBSD libc. In order to link to libintl, which is
not located in the default search path of the linker, we need to add
the required path via the linker command line. However, LDFLAGS is
ignored when running g-ir-scanner starting from r167873, so we have
to manually pick required flags from CMAKE_SHARED_LINKER_FLAGS and
put them in correct order to prevent g-ir-scanner from linking to
the installed version of libraries.

• PlatformGTK.cmake:

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-12-09  Ting-Wei Lan  <lantw44@gmail.com>
+
+        [GTK] LDFLAGS is ignored when running g-ir-scanner
+        https://bugs.webkit.org/show_bug.cgi?id=138832
+
+        Reviewed by Carlos Garcia Campos.
+
+        GTK+ requires libintl on FreeBSD because there is no gettext
+        implementation in FreeBSD libc. In order to link to libintl, which is
+        not located in the default search path of the linker, we need to add
+        the required path via the linker command line. However, LDFLAGS is
+        ignored when running g-ir-scanner starting from r167873, so we have
+        to manually pick required flags from CMAKE_SHARED_LINKER_FLAGS and
+        put them in correct order to prevent g-ir-scanner from linking to
+        the installed version of libraries.
+
+        * PlatformGTK.cmake:
+
 2014-12-09  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -749 +749 @@
 endif ()
 
+# Add required -L flags from ${CMAKE_SHARED_LINKER_FLAGS} for g-ir-scanner
+string(REGEX MATCHALL "-L[^ ]*"
+    INTROSPECTION_ADDITIONAL_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS})
+
 add_custom_command(
     OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
@@ -769 +773 @@
         --library=javascriptcoregtk-${WEBKITGTK_API_VERSION}
         -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        ${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}
         --no-libtool
         --pkg=gobject-2.0
@@ -808 +813 @@
         --library=javascriptcoregtk-${WEBKITGTK_API_VERSION}
         -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+        ${INTROSPECTION_ADDITIONAL_LINKER_FLAGS}
         --no-libtool
         --pkg=gobject-2.0