Changeset 206068 in webkit

Timestamp:

Sep 17, 2016 3:47:42 AM (8 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.14

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitMacros.cmake (modified) (2 diffs)

releases/WebKitGTK/webkit-2.14/ChangeLog

@@ +1 @@
+2016-09-16  Carlos Garcia Campos  <cgarcia@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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.14/Source/cmake/WebKitMacros.cmake

@@ -76 +76 @@
         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})
@@ -84 +87 @@
             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)