Title: [249178] releases/WebKitGTK/webkit-2.24
- Revision
- 249178
- Author
- ape...@igalia.com
- Date
- 2019-08-27 15:29:45 -0700 (Tue, 27 Aug 2019)
Log Message
Merged r248954 - [GTK][WPE] Gtk-Doc fails with build options which need cooperation between CFLAGS and LDFLAGS
https://bugs.webkit.org/show_bug.cgi?id=200987
Reviewed by Philippe Normand.
Only CFLAGS was being set before trying to generate the documentation
but not LDFLAGS, which could cause errors when gtk-doc tries to link
a generated program when the compiler flags would also require usage
of certain linker flags later on.
* Source/cmake/GtkDoc.cmake: Also set LDFLAGS in the environment when
invoking Tools/gtkdoc/generate-gtkdoc.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/ChangeLog (249177 => 249178)
--- releases/WebKitGTK/webkit-2.24/ChangeLog 2019-08-27 22:21:23 UTC (rev 249177)
+++ releases/WebKitGTK/webkit-2.24/ChangeLog 2019-08-27 22:29:45 UTC (rev 249178)
@@ -1,3 +1,18 @@
+2019-08-21 Adrian Perez de Castro <ape...@igalia.com>
+
+ [GTK][WPE] Gtk-Doc fails with build options which need cooperation between CFLAGS and LDFLAGS
+ https://bugs.webkit.org/show_bug.cgi?id=200987
+
+ Reviewed by Philippe Normand.
+
+ Only CFLAGS was being set before trying to generate the documentation
+ but not LDFLAGS, which could cause errors when gtk-doc tries to link
+ a generated program when the compiler flags would also require usage
+ of certain linker flags later on.
+
+ * Source/cmake/GtkDoc.cmake: Also set LDFLAGS in the environment when
+ invoking Tools/gtkdoc/generate-gtkdoc.
+
2019-07-02 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.24.3 release
Modified: releases/WebKitGTK/webkit-2.24/Source/cmake/GtkDoc.cmake (249177 => 249178)
--- releases/WebKitGTK/webkit-2.24/Source/cmake/GtkDoc.cmake 2019-08-27 22:21:23 UTC (rev 249177)
+++ releases/WebKitGTK/webkit-2.24/Source/cmake/GtkDoc.cmake 2019-08-27 22:29:45 UTC (rev 249178)
@@ -4,7 +4,7 @@
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
DEPENDS ${DocumentationDependencies}
- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
COMMAND touch ${_stamp_name}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
VERBATIM
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
