Title: [167873] trunk/Source/WebKit2
- Revision
- 167873
- Author
- carlo...@webkit.org
- Date
- 2014-04-28 00:51:42 -0700 (Mon, 28 Apr 2014)
Log Message
[GTK] GObject introspection links to installed libs when using jhbuild
https://bugs.webkit.org/show_bug.cgi?id=132220
Reviewed by Martin Robinson.
The problem is that gobject-introspection is linking the temporary
binaries adding the library paths present LDFLAGS environment
variable first, taking precedence over the libraries in the build
dir. Since the libraries paths of the dependencies are already
correctly deduced by gobject-introspection using ldd, we can
just unset the LDFLAGS variable before calling g-ir-scanner to
make sure the libraries in the build dir take predence.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167872 => 167873)
--- trunk/Source/WebKit2/ChangeLog 2014-04-28 06:15:33 UTC (rev 167872)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-28 07:51:42 UTC (rev 167873)
@@ -1,3 +1,20 @@
+2014-04-28 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK] GObject introspection links to installed libs when using jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=132220
+
+ Reviewed by Martin Robinson.
+
+ The problem is that gobject-introspection is linking the temporary
+ binaries adding the library paths present LDFLAGS environment
+ variable first, taking precedence over the libraries in the build
+ dir. Since the libraries paths of the dependencies are already
+ correctly deduced by gobject-introspection using ldd, we can
+ just unset the LDFLAGS variable before calling g-ir-scanner to
+ make sure the libraries in the build dir take predence.
+
+ * PlatformGTK.cmake:
+
2014-04-27 Tim Horton <timothy_hor...@apple.com>
REGRESSION (r164702): Double tap doesn't stay under the new element once the animation finishes
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (167872 => 167873)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-04-28 06:15:33 UTC (rev 167872)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-04-28 07:51:42 UTC (rev 167873)
@@ -684,7 +684,7 @@
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
DEPENDS WebKit2
DEPENDS _javascript_Core-3-gir
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
${INTROSPECTION_SCANNER}
--quiet
--warn-all
@@ -722,7 +722,7 @@
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
DEPENDS _javascript_Core-3-gir
DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
${INTROSPECTION_SCANNER}
--quiet
--warn-all
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
