Title: [206068] releases/WebKitGTK/webkit-2.14
Revision
206068
Author
carlo...@webkit.org
Date
2016-09-17 03:47:42 -0700 (Sat, 17 Sep 2016)

Log Message

Merge r206020 - [CMake] Build broken with current debian testing
https://bugs.webkit.org/show_bug.cgi?id=162054

Reviewed by Žan Doberšek.

Building WTR bindings is broken now in Debian testing. The reason is that '.' is no longer included in @INC for
perl, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588017 and
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1238.

* Source/cmake/WebKitMacros.cmake(GENERATE_BINDINGS): Pass also the given BASE_DIR to perl executable so that it
can find modules in the current directory even if '.' is not in @INC. Also include generators in BASE_DIR to the
list of dependencies.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.14/ChangeLog (206067 => 206068)


--- releases/WebKitGTK/webkit-2.14/ChangeLog	2016-09-17 08:34:20 UTC (rev 206067)
+++ releases/WebKitGTK/webkit-2.14/ChangeLog	2016-09-17 10:47:42 UTC (rev 206068)
@@ -1,3 +1,18 @@
+2016-09-16  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [CMake] Build broken with current debian testing
+        https://bugs.webkit.org/show_bug.cgi?id=162054
+
+        Reviewed by Žan Doberšek.
+
+        Building WTR bindings is broken now in Debian testing. The reason is that '.' is no longer included in @INC for
+        perl, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588017 and
+        https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-1238.
+
+        * Source/cmake/WebKitMacros.cmake(GENERATE_BINDINGS): Pass also the given BASE_DIR to perl executable so that it
+        can find modules in the current directory even if '.' is not in @INC. Also include generators in BASE_DIR to the
+        list of dependencies.
+
 2016-09-15  Carlos Garcia Campos  <cgar...@igalia.com>
 
         Unreviewed. Update OptionsGTK.cmake and NEWS for 2.13.92 release.

Modified: releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitMacros.cmake (206067 => 206068)


--- releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitMacros.cmake	2016-09-17 08:34:20 UTC (rev 206067)
+++ releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitMacros.cmake	2016-09-17 10:47:42 UTC (rev 206068)
@@ -75,6 +75,9 @@
     if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${_generator}.pm)
         list(APPEND COMMON_GENERATOR_DEPENDENCIES ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${_generator}.pm)
     endif ()
+    if (EXISTS ${_base_dir}/CodeGenerator${_generator}.pm)
+        list(APPEND common_generator_dependencies ${_base_dir}/CodeGenerator${_generator}.pm)
+    endif ()
 
     foreach (_file ${_input_files})
         get_filename_component(_name ${_file} NAME_WE)
@@ -83,7 +86,7 @@
             OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
             MAIN_DEPENDENCY ${_file}
             DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
-            COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
+            COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${_base_dir} ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
             WORKING_DIRECTORY ${_base_dir}
             VERBATIM)
         list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to