Title: [206020] trunk
- Revision
- 206020
- Author
- carlo...@webkit.org
- Date
- 2016-09-16 03:02:43 -0700 (Fri, 16 Sep 2016)
Log Message
[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: trunk/ChangeLog (206019 => 206020)
--- trunk/ChangeLog 2016-09-16 09:59:52 UTC (rev 206019)
+++ trunk/ChangeLog 2016-09-16 10:02:43 UTC (rev 206020)
@@ -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 Fujii Hironori <hironori.fu...@sony.com>
[CMake] Refactor GENERATE_BINDINGS
Modified: trunk/Source/cmake/WebKitMacros.cmake (206019 => 206020)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-09-16 09:59:52 UTC (rev 206019)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-09-16 10:02:43 UTC (rev 206020)
@@ -105,6 +105,9 @@
if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
list(APPEND common_generator_dependencies ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
endif ()
+ if (EXISTS ${arg_BASE_DIR}/CodeGenerator${arg_GENERATOR}.pm)
+ list(APPEND common_generator_dependencies ${arg_BASE_DIR}/CodeGenerator${arg_GENERATOR}.pm)
+ endif ()
set(gen_sources)
foreach (_file ${arg_INPUT_FILES})
@@ -114,7 +117,7 @@
OUTPUT ${arg_DESTINATION}/JS${_name}.cpp ${arg_DESTINATION}/JS${_name}.h
MAIN_DEPENDENCY ${_file}
DEPENDS ${common_generator_dependencies}
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${arg_BASE_DIR} ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file}
WORKING_DIRECTORY ${arg_BASE_DIR}
VERBATIM)
list(APPEND gen_sources ${arg_DESTINATION}/JS${_name}.cpp)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes