143956 2015-04-20 11:37:39 -0700 [CMake] Should be possible for an option to conflict with other options 2015-04-27 15:05:21 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Enhancement --- 143839 144105 1 mcatanzaro mcatanzaro commit-queue mcatanzaro ossy oldest_to_newest 1086844 0 mcatanzaro 2015-04-20 11:37:39 -0700 Currently it's not possible for an option to conflict with another option. This makes it awkward to manually check whether the combination of available options is valid. For example, for bug #143558 I want to introduce ENABLE_X11_TARGET and ENABLE_WAYLAND_TARGET options, but these are mutually exclusive. It'd be nice to declare this in one line, rather than handling it manually. 1086853 1 251174 mcatanzaro 2015-04-20 11:47:35 -0700 Created attachment 251174 Patch 1086856 2 251176 mcatanzaro 2015-04-20 11:49:24 -0700 Created attachment 251176 Patch 1087467 3 251341 mcatanzaro 2015-04-22 11:14:16 -0700 Created attachment 251341 Patch 1087483 4 251341 mrobinson 2015-04-22 11:44:13 -0700 Comment on attachment 251341 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251341&action=review > Source/cmake/WebKitFeatures.cmake:207 > +macro(_WEBKIT_OPTION_ENFORCE_CONFLICTS) > + set(_OPTION_CHANGED TRUE) > + while (${_OPTION_CHANGED}) > + set(_OPTION_CHANGED FALSE) > + foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS}) > + if (${_name}) > + foreach (_conflict ${_WEBKIT_AVAILABLE_OPTIONS_${_name}_CONFLICTS}) > + if (${_conflict}) > + message(STATUS "Disabling ${_name} since ${_conflict} is enabled.") > + set(${_name} OFF) > + set(_OPTION_CHANGED TRUE) > + set(_CONTINUE_DEPENDENCY_PROCESSING TRUE) > break () > endif () > endforeach () I think it makes sense to error out the build immediately when options conflict. As with the other patch, it probably makes sense to call this macro with each feature name as an argument. 1087837 5 251441 mcatanzaro 2015-04-23 08:59:54 -0700 Created attachment 251441 [CMake] Should be possible for an option to conflict with other options 1087842 6 mcatanzaro 2015-04-23 09:07:21 -0700 (In reply to comment #4) > I think it makes sense to error out the build immediately when options > conflict. That's definitely desirable for options that the user explicitly specified: e.g. if the user picks -DENABLE_X11_TARGET=ON and -DENABLE_WAYLAND_TARGET=ON, then an error would be dandy. The reason I did not implement that here is that it could be nice for options to be automatically adjusted to make things work: I figure it would be nice to be able to pass -DENABLE_WAYLAND_TARGET=ON without being required to also pass -DENABLE_X11_TARGET=OFF as well. Making it an error would require more typing, but reduce the chance of mistakes. I have no strong preference either way; if you still want it to be an error, I'll update the patch again. 1087861 7 mcatanzaro 2015-04-23 10:09:18 -0700 (In reply to comment #6) > I have no strong preference > either way; if you still want it to be an error, I'll update the patch again. Thinking about this more, I think it's desirable to keep the current behavior. Say we have the public option ENABLE_VIDEO. ENABLE_VIDEO_TRACK depends on that. But we don't want to make ENABLE_VIDEO_TRACK public, so the user will be receiving an error message complaining that he has enabled a feature that apparently does not exist. 1087961 8 251476 mcatanzaro 2015-04-23 13:19:34 -0700 Created attachment 251476 Patch 1088030 9 251476 mcatanzaro 2015-04-23 15:11:31 -0700 Comment on attachment 251476 Patch We decided to error out anyway. There should only be a few conflicts, and forcing the user to be explicit about a couple things is OK. The example I gave above failed because that is handled by WEBKIT_OPTION_DEPEND, not WEBKIT_OPTION_CONFLICT. 1088133 10 251525 mcatanzaro 2015-04-23 18:36:48 -0700 Created attachment 251525 [CMake] Should be possible for an option to conflict with other options 1088134 11 mcatanzaro 2015-04-23 18:37:29 -0700 Example error: CMake Error at Source/cmake/WebKitFeatures.cmake:206 (message): ENABLE_ACCELERATED_2D_CANVAS conflicts with ENABLE_GLES2: you must disable one or the other. Call Stack (most recent call first): Source/cmake/WebKitFeatures.cmake:214 (_WEBKIT_OPTION_ENFORCE_CONFLICTS) Source/cmake/WebKitFeatures.cmake:237 (_WEBKIT_OPTION_ENFORCE_ALL_CONFLICTS) Source/cmake/OptionsGTK.cmake:181 (WEBKIT_OPTION_END) CMakeLists.txt:156 (include) -- Configuring incomplete, errors occurred! See also "/home/mcatanzaro/WebKit/WebKitBuild/GNOME/CMakeFiles/CMakeOutput.log". See also "/home/mcatanzaro/WebKit/WebKitBuild/GNOME/CMakeFiles/CMakeError.log". 1089214 12 251525 commit-queue 2015-04-27 15:05:17 -0700 Comment on attachment 251525 [CMake] Should be possible for an option to conflict with other options Clearing flags on attachment: 251525 Committed r183427: <http://trac.webkit.org/changeset/183427> 1089215 13 commit-queue 2015-04-27 15:05:21 -0700 All reviewed patches have been landed. Closing bug. 251174 2015-04-20 11:47:35 -0700 2015-04-20 11:49:21 -0700 Patch bug-143956-20150420134633.patch text/plain 3013 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggYTdlMDMzOTA5NzUwMGY4MWZlMjQ5YjI1ZTlhM2NhZWI5MTA5YTIxMC4uNjcwNGY0YTQ0MmQ5 NjRmMDc4OGU0ZGI4NzhkZDBkM2U5OTVmNWJlYiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICIiKQogICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlMgJHtfbmFtZX0pCiBlbmRtYWNybygpCiAKQEAgLTE2LDcgKzE3LDcgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiBl bmRtYWNybygpCiAKIG1hY3JvKFdFQktJVF9PUFRJT05fREVQRU5EIF9uYW1lIF9kZXBlbmQpCi0g ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfREVQRU5ERU5DWV9PRl8ke19uYW1lfSAk e19kZXBlbmR9KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fREVQRU5ERU5DSUVTICR7X2RlcGVuZH0pCiBlbmRtYWNybygpCiAKIG1hY3JvKFdFQktJ VF9PUFRJT05fQkVHSU4pCkBAIC0xNjUsNiArMTY2LDcgQEAgZW5kbWFjcm8oKQogCiBtYWNybyhX RUJLSVRfT1BUSU9OX0VORCkKICAgICBsaXN0KFNPUlQgX1dFQktJVF9BVkFJTEFCTEVfT1BUSU9O UykKKwogICAgIHNldChfTUFYX0ZFQVRVUkVfTEVOR1RIIDApCiAgICAgZm9yZWFjaCAoX25hbWUg JHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TfSkKICAgICAgICAgc3RyaW5nKExFTkdUSCAke19u YW1lfSBfTkFNRV9MRU5HVEgpCkBAIC0xNzYsMTIgKzE3OCwxNyBAQCBtYWNybyhXRUJLSVRfT1BU SU9OX0VORCkKICAgICAgICAgaWYgKE5PVCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BV QkxJQ18ke19uYW1lfSkKICAgICAgICAgICAgIG1hcmtfYXNfYWR2YW5jZWQoRk9SQ0UgJHtfbmFt ZX0pCiAgICAgICAgIGVuZGlmICgpCisgICAgZW5kZm9yZWFjaCAoKQogCi0gICAgICAgIGlmICgk e19uYW1lfSBBTkQgREVGSU5FRCBfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0RFUEVOREVOQ1lf T0ZfJHtfbmFtZX0pCi0gICAgICAgICAgICBpZiAoTk9UICR7JHtfV0VCS0lUX0FWQUlMQUJMRV9P UFRJT05TX0RFUEVOREVOQ1lfT0ZfJHtfbmFtZX19fSkKLSAgICAgICAgICAgICAgICBtZXNzYWdl KFNUQVRVUyAiRGlzYWJsaW5nICR7X25hbWV9IHNpbmNlICR7X1dFQktJVF9BVkFJTEFCTEVfT1BU SU9OU19ERVBFTkRFTkNZX09GXyR7X25hbWV9fSBzdXBwb3J0IGlzIGRpc2FibGVkLiIpCi0gICAg ICAgICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKLSAgICAgICAgICAgIGVuZGlmICgpCisgICAg Zm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TfSkKKyAgICAgICAgaWYg KCR7X25hbWV9KQorICAgICAgICAgICAgZm9yZWFjaCAoX2RlcGVuZGVuY3kgJHtfV0VCS0lUX0FW QUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFU30pCisgICAgICAgICAgICAgICAg aWYgKE5PVCAke19kZXBlbmRlbmN5fSkKKyAgICAgICAgICAgICAgICAgICAgbWVzc2FnZShTVEFU VVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19kZXBlbmRlbmN5fSBpcyBkaXNhYmxlZC4i KQorICAgICAgICAgICAgICAgICAgICBzZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgICAg ICAgICBicmVhayAoKQorICAgICAgICAgICAgICAgIGVuZGlmICgpCisgICAgICAgICAgICBlbmRm b3JlYWNoICgpCiAgICAgICAgIGVuZGlmICgpCiAKICAgICAgICAgaWYgKCR7X25hbWV9KQpkaWZm IC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IGU5N2E4MzkwZmZhZDhiZjhkMjQ3 NDhmZTBhMTcwOWIwY2M0NjhiNzAuLjcwZTRhZDY4ZjZiZTNlMWY1ZGMzNzljZWE1ZGVkZGU1OWFl Yjc3YjMgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwx NiBAQAogMjAxNS0wNC0xNiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5j b20+CiAKKyAgICAgICAgW0NNYWtlXSBTaG91bGQgYmUgcG9zc2libGUgZm9yIGFuIG9wdGlvbiB0 byBkZXBlbmQgb24gbXVsdGlwbGUgb3B0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVXNlIGEgbGlzdCBpbnN0ZWFkIG9mIGEgc2luZ2xlIHZhcmlh YmxlIHRvIHRyYWNrIHRoZSBkZXBlbmRlbmNpZXMgb2YgZWFjaCBvcHRpb24uCisKKyAgICAgICAg KiBTb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2U6CisKKzIwMTUtMDQtMTYgIE1pY2hh ZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFtDTWFrZV0g RmVhdHVyZXMgbGlzdCBzaG91bGQgcHJpbnQgZG90cyBldmVyeSBvdGhlciByb3cKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MzgzMgogCg== 251176 2015-04-20 11:49:24 -0700 2015-04-22 11:14:12 -0700 Patch bug-143956-20150420134822.patch text/plain 2538 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggNjcwNGY0YTQ0MmQ5NjRmMDc4OGU0ZGI4NzhkZDBkM2U5OTVmNWJlYi4uMWRmMzgwZjNmNDg3 M2RhYTk1ZTRhNDBhZTkzZTFmYzNlMmQ2MDU0MiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fQ09ORkxJQ1RTICIiKQogICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7 X25hbWV9X0RFUEVOREVOQ0lFUyAiIikKICAgICBsaXN0KEFQUEVORCBfV0VCS0lUX0FWQUlMQUJM RV9PUFRJT05TICR7X25hbWV9KQogZW5kbWFjcm8oKQpAQCAtMTYsNiArMTcsMTAgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiAg ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfSU5JVElBTF9WQUxVRV8ke19uYW1lfSAk e192YWx1ZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKFdFQktJVF9PUFRJT05fQ09ORkxJQ1QgX25h bWUgX2NvbmZsaWN0KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNf JHtfbmFtZX1fQ09ORkxJQ1RTICR7X2NvbmZsaWN0fSkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VC S0lUX09QVElPTl9ERVBFTkQgX25hbWUgX2RlcGVuZCkKICAgICBsaXN0KEFQUEVORCBfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFUyAke19kZXBlbmR9KQogZW5k bWFjcm8oKQpAQCAtMTkyLDYgKzE5NywxNiBAQCBtYWNybyhXRUJLSVRfT1BUSU9OX0VORCkKICAg ICAgICAgZW5kaWYgKCkKIAogICAgICAgICBpZiAoJHtfbmFtZX0pCisgICAgICAgICAgICBmb3Jl YWNoIChfY29uZmxpY3QgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0NPTkZM SUNUU30pCisgICAgICAgICAgICAgICAgaWYgKCR7X2NvbmZsaWN0fSkKKyAgICAgICAgICAgICAg ICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19jb25mbGlj dH0gaXMgZW5hYmxlZC4iKQorICAgICAgICAgICAgICAgICAgICBzZXQoJHtfbmFtZX0gT0ZGKQor ICAgICAgICAgICAgICAgICAgICBicmVhayAoKQorICAgICAgICAgICAgICAgIGVuZGlmICgpCisg ICAgICAgICAgICBlbmRmb3JlYWNoICgpCisgICAgICAgIGVuZGlmICgpCisKKyAgICAgICAgaWYg KCR7X25hbWV9KQogICAgICAgICAgICAgbGlzdChBUFBFTkQgRkVBVFVSRV9ERUZJTkVTICR7X25h bWV9KQogICAgICAgICAgICAgc2V0KEZFQVRVUkVfREVGSU5FU19XSVRIX1NQQUNFX1NFUEFSQVRP UiAiJHtGRUFUVVJFX0RFRklORVNfV0lUSF9TUEFDRV9TRVBBUkFUT1J9ICR7X25hbWV9IikKICAg ICAgICAgZW5kaWYgKCkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA3 MGU0YWQ2OGY2YmUzZTFmNWRjMzc5Y2VhNWRlZGRlNTlhZWI3N2IzLi42YzdiN2QwODFhNDU1YTRk OTFlMDQ3MWJlMDU2NGVjYjMyMjEwMmUyIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMDQtMjAgIE1pY2hhZWwgQ2F0YW56YXJvICA8 bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCisgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBvc3Np YmxlIGZvciBhbiBvcHRpb24gdG8gY29uZmxpY3Qgd2l0aCBvdGhlciBvcHRpb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV0VCS0lUX09QVElP Tl9DT05GTElDVCBtYWNybywgd2hpY2ggdHVybnMgb2ZmIGFuIG9wdGlvbiBpZiBhbm90aGVyIG9w dGlvbiBpcyBvZmYuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21h a2U6CisKIDIwMTUtMDQtMTYgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEu Y29tPgogCiAgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBvc3NpYmxlIGZvciBhbiBvcHRpb24g dG8gZGVwZW5kIG9uIG11bHRpcGxlIG9wdGlvbnMK 251341 2015-04-22 11:14:16 -0700 2015-04-23 08:59:52 -0700 Patch bug-143956-20150422131313.patch text/plain 3594 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggODc4Yjk2MzZiMDVmMzc2YWY5Mjc4NTMyNzBiYTY2ZDhmM2I5YzA2Yy4uZjBlNGQ4MTQ0NGY4 OTZiOTcwNjQyZGY2Yzc0ZGFlODFhY2I4ZGE3MyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fQ09ORkxJQ1RTICIiKQogICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7 X25hbWV9X0RFUEVOREVOQ0lFUyAiIikKICAgICBsaXN0KEFQUEVORCBfV0VCS0lUX0FWQUlMQUJM RV9PUFRJT05TICR7X25hbWV9KQogZW5kbWFjcm8oKQpAQCAtMTYsNiArMTcsMTAgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiAg ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfSU5JVElBTF9WQUxVRV8ke19uYW1lfSAk e192YWx1ZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKFdFQktJVF9PUFRJT05fQ09ORkxJQ1QgX25h bWUgX2NvbmZsaWN0KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNf JHtfbmFtZX1fQ09ORkxJQ1RTICR7X2NvbmZsaWN0fSkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VC S0lUX09QVElPTl9ERVBFTkQgX25hbWUgX2RlcGVuZCkKICAgICBsaXN0KEFQUEVORCBfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFUyAke19kZXBlbmR9KQogZW5k bWFjcm8oKQpAQCAtMTc2LDYgKzE4MSwyNyBAQCBtYWNybyhfV0VCS0lUX09QVElPTl9FTkZPUkNF X0RFUEVORFMpCiAgICAgICAgICAgICAgICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJs aW5nICR7X25hbWV9IHNpbmNlICR7X2RlcGVuZGVuY3l9IGlzIGRpc2FibGVkLiIpCiAgICAgICAg ICAgICAgICAgICAgICAgICBzZXQoJHtfbmFtZX0gT0ZGKQogICAgICAgICAgICAgICAgICAgICAg ICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVFKQorICAgICAgICAgICAgICAgICAgICAgICAgc2V0 KF9DT05USU5VRV9ERVBFTkRFTkNZX1BST0NFU1NJTkcgVFJVRSkKKyAgICAgICAgICAgICAgICAg ICAgICAgIGJyZWFrICgpCisgICAgICAgICAgICAgICAgICAgIGVuZGlmICgpCisgICAgICAgICAg ICAgICAgZW5kZm9yZWFjaCAoKQorICAgICAgICAgICAgZW5kaWYgKCkKKyAgICAgICAgZW5kZm9y ZWFjaCAoKQorICAgIGVuZHdoaWxlICgpCitlbmRtYWNybygpCisKK21hY3JvKF9XRUJLSVRfT1BU SU9OX0VORk9SQ0VfQ09ORkxJQ1RTKQorICAgIHNldChfT1BUSU9OX0NIQU5HRUQgVFJVRSkKKyAg ICB3aGlsZSAoJHtfT1BUSU9OX0NIQU5HRUR9KQorICAgICAgICBzZXQoX09QVElPTl9DSEFOR0VE IEZBTFNFKQorICAgICAgICBmb3JlYWNoIChfbmFtZSAke19XRUJLSVRfQVZBSUxBQkxFX09QVElP TlN9KQorICAgICAgICAgICAgaWYgKCR7X25hbWV9KQorICAgICAgICAgICAgICAgIGZvcmVhY2gg KF9jb25mbGljdCAke19XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtfbmFtZX1fQ09ORkxJQ1RT fSkKKyAgICAgICAgICAgICAgICAgICAgaWYgKCR7X2NvbmZsaWN0fSkKKyAgICAgICAgICAgICAg ICAgICAgICAgIG1lc3NhZ2UoU1RBVFVTICJEaXNhYmxpbmcgJHtfbmFtZX0gc2luY2UgJHtfY29u ZmxpY3R9IGlzIGVuYWJsZWQuIikKKyAgICAgICAgICAgICAgICAgICAgICAgIHNldCgke19uYW1l fSBPRkYpCisgICAgICAgICAgICAgICAgICAgICAgICBzZXQoX09QVElPTl9DSEFOR0VEIFRSVUUp CisgICAgICAgICAgICAgICAgICAgICAgICBzZXQoX0NPTlRJTlVFX0RFUEVOREVOQ1lfUFJPQ0VT U0lORyBUUlVFKQogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWsgKCkKICAgICAgICAgICAg ICAgICAgICAgZW5kaWYgKCkKICAgICAgICAgICAgICAgICBlbmRmb3JlYWNoICgpCkBAIC0yMDAs NyArMjI2LDEyIEBAIG1hY3JvKFdFQktJVF9PUFRJT05fRU5EKQogICAgICAgICBlbmRpZiAoKQog ICAgIGVuZGZvcmVhY2ggKCkKIAotICAgIF9XRUJLSVRfT1BUSU9OX0VORk9SQ0VfREVQRU5EUyAo KQorICAgIHNldChfQ09OVElOVUVfREVQRU5ERU5DWV9QUk9DRVNTSU5HIFRSVUUpCisgICAgd2hp bGUgKCR7X0NPTlRJTlVFX0RFUEVOREVOQ1lfUFJPQ0VTU0lOR30pCisgICAgICAgIHNldChfQ09O VElOVUVfREVQRU5ERU5DWV9QUk9DRVNTSU5HIEZBTFNFKQorICAgICAgICBfV0VCS0lUX09QVElP Tl9FTkZPUkNFX0RFUEVORFMgKCkKKyAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9DT05G TElDVFMgKCkKKyAgICBlbmR3aGlsZSAoKQogCiAgICAgZm9yZWFjaCAoX25hbWUgJHtfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TfSkKICAgICAgICAgaWYgKCR7X25hbWV9KQpkaWZmIC0tZ2l0IGEv Q2hhbmdlTG9nIGIvQ2hhbmdlTG9nCmluZGV4IDFmMWQwNWMyZmZhYjk0YjhiNTIwMzZkYmZkNDVm MjU1YWI3ZTczNjUuLjg1ODdlMjU2M2U1NTg0MzljNzg0NTQyMmVjMDU5NmYzNzEwMTJmYTYgMTAw NjQ0Ci0tLSBhL0NoYW5nZUxvZworKysgYi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNiBAQAogMjAx NS0wNC0yMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKKyAg ICAgICAgW0NNYWtlXSBTaG91bGQgYmUgcG9zc2libGUgZm9yIGFuIG9wdGlvbiB0byBjb25mbGlj dCB3aXRoIG90aGVyIG9wdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0Mzk1NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEFkZCBXRUJLSVRfT1BUSU9OX0NPTkZMSUNUIG1hY3JvLCB3aGljaCB0dXJu cyBvZmYgYW4gb3B0aW9uIGlmIGFub3RoZXIgb3B0aW9uIGlzIG9mZi4KKworICAgICAgICAqIFNv dXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFrZToKKworMjAxNS0wNC0yMiAgTWljaGFlbCBD YXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKICAgICAgICAgW0NNYWtlXSBTaG91 bGQgYmUgcG9zc2libGUgZm9yIGFuIG9wdGlvbiB0byBkZXBlbmQgb24gbXVsdGlwbGUgb3B0aW9u cwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzODM5 CiAK 251441 2015-04-23 08:59:54 -0700 2015-04-23 13:19:30 -0700 [CMake] Should be possible for an option to conflict with other options bug-143956-20150423105850.patch text/plain 4513 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggZGY1ZWJmY2Y4MjYwN2VmYzc0ODE1YTNkYjc2OWJiYTVlYjgxMmVhNi4uODQ4Njg0MjdmYWEw Y2Q5MzY1OTRjM2E3ZTcxMGEyZGUzY2U0MmY2MyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fQ09ORkxJQ1RTICIiKQogICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7 X25hbWV9X0RFUEVOREVOQ0lFUyAiIikKICAgICBsaXN0KEFQUEVORCBfV0VCS0lUX0FWQUlMQUJM RV9PUFRJT05TICR7X25hbWV9KQogZW5kbWFjcm8oKQpAQCAtMTYsNiArMTcsMTAgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiAg ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfSU5JVElBTF9WQUxVRV8ke19uYW1lfSAk e192YWx1ZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKFdFQktJVF9PUFRJT05fQ09ORkxJQ1QgX25h bWUgX2NvbmZsaWN0KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNf JHtfbmFtZX1fQ09ORkxJQ1RTICR7X2NvbmZsaWN0fSkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VC S0lUX09QVElPTl9ERVBFTkQgX25hbWUgX2RlcGVuZCkKICAgICBsaXN0KEFQUEVORCBfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFUyAke19kZXBlbmR9KQogZW5k bWFjcm8oKQpAQCAtMTc0LDEyICsxNzksNDcgQEAgbWFjcm8oX1dFQktJVF9PUFRJT05fRU5GT1JD RV9ERVBFTkRTIF9uYW1lKQogICAgICAgICBpZiAoTk9UICR7X2RlcGVuZGVuY3l9KQogICAgICAg ICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19kZXBlbmRl bmN5fSBpcyBkaXNhYmxlZC4iKQogICAgICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKLSAgICAg ICAgICAgIHNldChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgVFJVRSkKKyAgICAgICAg ICAgIHNldChfT1BUSU9OX0NIQU5HRUQgVFJVRSkKKyAgICAgICAgICAgIGJyZWFrICgpCisgICAg ICAgIGVuZGlmICgpCisgICAgZW5kZm9yZWFjaCAoKQorZW5kbWFjcm8oKQorCittYWNybyhfV0VC S0lUX09QVElPTl9FTkZPUkNFX0NPTkZMSUNUUyBfbmFtZSkKKyAgICBmb3JlYWNoIChfY29uZmxp Y3QgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0NPTkZMSUNUU30pCisgICAg ICAgIGlmICgke19jb25mbGljdH0pCisgICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJs aW5nICR7X25hbWV9IHNpbmNlICR7X2NvbmZsaWN0fSBpcyBlbmFibGVkLiIpCisgICAgICAgICAg ICBzZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVF KQogICAgICAgICAgICAgYnJlYWsgKCkKICAgICAgICAgZW5kaWYgKCkKICAgICBlbmRmb3JlYWNo ICgpCiBlbmRtYWNybygpCiAKK21hY3JvKF9XRUJLSVRfT1BUSU9OX0VORk9SQ0VfQUxMX0RFUEVO RFMpCisgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVFKQorICAgIHdoaWxlICgke19PUFRJT05f Q0hBTkdFRH0pCisgICAgICAgIHNldChfT1BUSU9OX0NIQU5HRUQgRkFMU0UpCisgICAgICAgIGZv cmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCisgICAgICAgICAgICBp ZiAoJHtfbmFtZX0pCisgICAgICAgICAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9ERVBF TkRTKCR7X25hbWV9KQorICAgICAgICAgICAgZW5kaWYgKCkKKyAgICAgICAgZW5kZm9yZWFjaCAo KQorICAgIGVuZHdoaWxlICgpCitlbmRtYWNybygpCisKK21hY3JvKF9XRUJLSVRfT1BUSU9OX0VO Rk9SQ0VfQUxMX0NPTkZMSUNUUykKKyAgICBzZXQoX09QVElPTl9DSEFOR0VEIFRSVUUpCisgICAg d2hpbGUgKCR7X09QVElPTl9DSEFOR0VEfSkKKyAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBG QUxTRSkKKyAgICAgICAgZm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05T fSkKKyAgICAgICAgICAgIGlmICgke19uYW1lfSkKKyAgICAgICAgICAgICAgICBfV0VCS0lUX09Q VElPTl9FTkZPUkNFX0NPTkZMSUNUUygke19uYW1lfSkKKyAgICAgICAgICAgIGVuZGlmICgpCisg ICAgICAgIGVuZGZvcmVhY2ggKCkKKyAgICBlbmR3aGlsZSAoKQorZW5kbWFjcm8oKQorCiBtYWNy byhXRUJLSVRfT1BUSU9OX0VORCkKICAgICBsaXN0KFNPUlQgX1dFQktJVF9BVkFJTEFCTEVfT1BU SU9OUykKICAgICBzZXQoX01BWF9GRUFUVVJFX0xFTkdUSCAwKQpAQCAtMTk1LDE1ICsyMzUsMTQg QEAgbWFjcm8oV0VCS0lUX09QVElPTl9FTkQpCiAgICAgICAgIGVuZGlmICgpCiAgICAgZW5kZm9y ZWFjaCAoKQogCi0gICAgc2V0KF9SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lORyBUUlVFKQot ICAgIHdoaWxlICgke19SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lOR30pCi0gICAgICAgIHNl dChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgRkFMU0UpCi0gICAgICAgIGZvcmVhY2gg KF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCi0gICAgICAgICAgICBpZiAoJHtf bmFtZX0pCi0gICAgICAgICAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9ERVBFTkRTKCR7 X25hbWV9KQotICAgICAgICAgICAgZW5kaWYgKCkKLSAgICAgICAgZW5kZm9yZWFjaCAoKQotICAg IGVuZHdoaWxlICgpCisgICAgIyBSdW4gdGhyb3VnaCBldmVyeSBwb3NzaWJsZSBkZXBlbmRzIHRv IG1ha2Ugc3VyZSB3ZSBoYXZlIGRpc2FibGVkIGFueXRoaW5nCisgICAgIyB0aGF0IGNvdWxkIGNh dXNlIGFuIHVubmVjZXNzYXJ5IGNvbmZsaWN0IGJlZm9yZSBwcm9jZXNzaW5nIGFueSBjb25mbGlj dHMsCisgICAgIyBzbyB0aGF0IG9wdGlvbnMgZG9uJ3QgZ2V0IGluYXBwcm9wcmlhdGVseSBkaXNh YmxlZC4gQWZ0ZXIgcHJvY2Vzc2luZworICAgICMgY29uZmxpY3RzLCBwcm9jZXNzIGRlcGVuZGVu Y2llcyBhZ2FpbiBpbiBjYXNlIGNvbmZsaWN0cyBkaXNhYmxlZCBhbiBvcHRpb24KKyAgICAjIHJl cXVpcmVkIGJ5IGFub3RoZXIuCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfREVQRU5E UygpCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfQ09ORkxJQ1RTKCkKKyAgICBfV0VC S0lUX09QVElPTl9FTkZPUkNFX0FMTF9ERVBFTkRTKCkKIAogICAgIGZvcmVhY2ggKF9uYW1lICR7 X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCiAgICAgICAgIGlmICgke19uYW1lfSkKZGlmZiAt LWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAxNDkyMWQ2NDk0ZmNmNmYyMjExZWFl MjdlY2VhOWVkNWQyNmFiOTJiLi5jMjY4NTFhZTI1MmMyZGVhNjM4NGIwMmM3Nzk1ODBiMGRlYjc5 MDkyIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYg QEAKIDIwMTUtMDQtMjIgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29t PgogCisgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBvc3NpYmxlIGZvciBhbiBvcHRpb24gdG8g Y29uZmxpY3Qgd2l0aCBvdGhlciBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgV0VCS0lUX09QVElPTl9DT05GTElDVCBtYWNybywgd2hp Y2ggdHVybnMgb2ZmIGFuIG9wdGlvbiBpZiBhbm90aGVyIG9wdGlvbiBpcyBvZmYuCisKKyAgICAg ICAgKiBTb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2U6CisKKzIwMTUtMDQtMjIgIE1p Y2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgorCiAgICAgICAgIFtDTWFr ZV0gU2hvdWxkIGJlIHBvc3NpYmxlIGZvciBhbiBvcHRpb24gdG8gZGVwZW5kIG9uIG11bHRpcGxl IG9wdGlvbnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0MzgzOQogCg== 251476 2015-04-23 13:19:34 -0700 2015-04-23 18:36:45 -0700 Patch bug-143956-20150423151829.patch text/plain 4506 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggZDZiNzc4OWIyZWQ5ZTRlNjJkN2Q5MDQ2YWQ3OTI5NDQwMDFlMGMwYS4uMDdhYzI4ZmZlMzVk ZDY5MzU4MjVkMjYwZmIzZGI4MTIzNzZlYTRlNyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fQ09ORkxJQ1RTICIiKQogICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7 X25hbWV9X0RFUEVOREVOQ0lFUyAiIikKICAgICBsaXN0KEFQUEVORCBfV0VCS0lUX0FWQUlMQUJM RV9PUFRJT05TICR7X25hbWV9KQogZW5kbWFjcm8oKQpAQCAtMTYsNiArMTcsMTAgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiAg ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfSU5JVElBTF9WQUxVRV8ke19uYW1lfSAk e192YWx1ZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKFdFQktJVF9PUFRJT05fQ09ORkxJQ1QgX25h bWUgX2NvbmZsaWN0KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNf JHtfbmFtZX1fQ09ORkxJQ1RTICR7X2NvbmZsaWN0fSkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VC S0lUX09QVElPTl9ERVBFTkQgX25hbWUgX2RlcGVuZCkKICAgICBsaXN0KEFQUEVORCBfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFUyAke19kZXBlbmR9KQogZW5k bWFjcm8oKQpAQCAtMTc0LDEyICsxNzksNDcgQEAgbWFjcm8oX1dFQktJVF9PUFRJT05fRU5GT1JD RV9ERVBFTkRTIF9uYW1lKQogICAgICAgICBpZiAoTk9UICR7X2RlcGVuZGVuY3l9KQogICAgICAg ICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19kZXBlbmRl bmN5fSBpcyBkaXNhYmxlZC4iKQogICAgICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKLSAgICAg ICAgICAgIHNldChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgVFJVRSkKKyAgICAgICAg ICAgIHNldChfT1BUSU9OX0NIQU5HRUQgVFJVRSkKKyAgICAgICAgICAgIGJyZWFrICgpCisgICAg ICAgIGVuZGlmICgpCisgICAgZW5kZm9yZWFjaCAoKQorZW5kbWFjcm8oKQorCittYWNybyhfV0VC S0lUX09QVElPTl9FTkZPUkNFX0NPTkZMSUNUUyBfbmFtZSkKKyAgICBmb3JlYWNoIChfY29uZmxp Y3QgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0NPTkZMSUNUU30pCisgICAg ICAgIGlmICgke19jb25mbGljdH0pCisgICAgICAgICAgICBtZXNzYWdlKFNUQVRVUyAiRGlzYWJs aW5nICR7X25hbWV9IHNpbmNlICR7X2NvbmZsaWN0fSBpcyBlbmFibGVkLiIpCisgICAgICAgICAg ICBzZXQoJHtfbmFtZX0gT0ZGKQorICAgICAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVF KQogICAgICAgICAgICAgYnJlYWsgKCkKICAgICAgICAgZW5kaWYgKCkKICAgICBlbmRmb3JlYWNo ICgpCiBlbmRtYWNybygpCiAKK21hY3JvKF9XRUJLSVRfT1BUSU9OX0VORk9SQ0VfQUxMX0RFUEVO RFMpCisgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBUUlVFKQorICAgIHdoaWxlICgke19PUFRJT05f Q0hBTkdFRH0pCisgICAgICAgIHNldChfT1BUSU9OX0NIQU5HRUQgRkFMU0UpCisgICAgICAgIGZv cmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCisgICAgICAgICAgICBp ZiAoJHtfbmFtZX0pCisgICAgICAgICAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9ERVBF TkRTKCR7X25hbWV9KQorICAgICAgICAgICAgZW5kaWYgKCkKKyAgICAgICAgZW5kZm9yZWFjaCAo KQorICAgIGVuZHdoaWxlICgpCitlbmRtYWNybygpCisKK21hY3JvKF9XRUJLSVRfT1BUSU9OX0VO Rk9SQ0VfQUxMX0NPTkZMSUNUUykKKyAgICBzZXQoX09QVElPTl9DSEFOR0VEIFRSVUUpCisgICAg d2hpbGUgKCR7X09QVElPTl9DSEFOR0VEfSkKKyAgICAgICAgc2V0KF9PUFRJT05fQ0hBTkdFRCBG QUxTRSkKKyAgICAgICAgZm9yZWFjaCAoX25hbWUgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05T fSkKKyAgICAgICAgICAgIGlmICgke19uYW1lfSkKKyAgICAgICAgICAgICAgICBfV0VCS0lUX09Q VElPTl9FTkZPUkNFX0NPTkZMSUNUUygke19uYW1lfSkKKyAgICAgICAgICAgIGVuZGlmICgpCisg ICAgICAgIGVuZGZvcmVhY2ggKCkKKyAgICBlbmR3aGlsZSAoKQorZW5kbWFjcm8oKQorCiBtYWNy byhXRUJLSVRfT1BUSU9OX0VORCkKICAgICBsaXN0KFNPUlQgX1dFQktJVF9BVkFJTEFCTEVfT1BU SU9OUykKICAgICBzZXQoX01BWF9GRUFUVVJFX0xFTkdUSCAwKQpAQCAtMTk1LDE1ICsyMzUsMTQg QEAgbWFjcm8oV0VCS0lUX09QVElPTl9FTkQpCiAgICAgICAgIGVuZGlmICgpCiAgICAgZW5kZm9y ZWFjaCAoKQogCi0gICAgc2V0KF9SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lORyBUUlVFKQot ICAgIHdoaWxlICgke19SRVNUQVJUX0RFUEVOREVOQ1lfUFJPQ0VTU0lOR30pCi0gICAgICAgIHNl dChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgRkFMU0UpCi0gICAgICAgIGZvcmVhY2gg KF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCi0gICAgICAgICAgICBpZiAoJHtf bmFtZX0pCi0gICAgICAgICAgICAgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9ERVBFTkRTKCR7 X25hbWV9KQotICAgICAgICAgICAgZW5kaWYgKCkKLSAgICAgICAgZW5kZm9yZWFjaCAoKQotICAg IGVuZHdoaWxlICgpCisgICAgIyBSdW4gdGhyb3VnaCBldmVyeSBwb3NzaWJsZSBkZXBlbmRzIHRv IG1ha2Ugc3VyZSB3ZSBoYXZlIGRpc2FibGVkIGFueXRoaW5nCisgICAgIyB0aGF0IGNvdWxkIGNh dXNlIGFuIHVubmVjZXNzYXJ5IGNvbmZsaWN0IGJlZm9yZSBwcm9jZXNzaW5nIGFueSBjb25mbGlj dHMsCisgICAgIyBzbyB0aGF0IG9wdGlvbnMgZG9uJ3QgZ2V0IGluYXBwcm9wcmlhdGVseSBkaXNh YmxlZC4gQWZ0ZXIgcHJvY2Vzc2luZworICAgICMgY29uZmxpY3RzLCBwcm9jZXNzIGRlcGVuZGVu Y2llcyBhZ2FpbiBpbiBjYXNlIGNvbmZsaWN0cyBkaXNhYmxlZCBhbiBvcHRpb24KKyAgICAjIHJl cXVpcmVkIGJ5IGFub3RoZXIuCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfREVQRU5E UygpCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfQ09ORkxJQ1RTKCkKKyAgICBfV0VC S0lUX09QVElPTl9FTkZPUkNFX0FMTF9ERVBFTkRTKCkKIAogICAgIGZvcmVhY2ggKF9uYW1lICR7 X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCiAgICAgICAgIGlmICgke19uYW1lfSkKZGlmZiAt LWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA2ODQwMGVjMzg5ODUxMDExNmM0OWE3 OGViZmE2NDM5Njc2YWUxODczLi5iZGZiMzI4OTJkNGYxMzYxNjNkZmNhYzNjOGQ5OTQ2ODczNTUw ODM1IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYg QEAKIDIwMTUtMDQtMjMgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29t PgogCisgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBvc3NpYmxlIGZvciBhbiBvcHRpb24gdG8g Y29uZmxpY3Qgd2l0aCBvdGhlciBvcHRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBZGQgV0VCS0lUX09QVElPTl9DT05GTElDVCBtYWNybywgd2hp Y2ggdHVybnMgb2ZmIGFuIG9wdGlvbiBpZiBhbm90aGVyIG9wdGlvbiBpcyBvbi4KKworICAgICAg ICAqIFNvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFrZToKKworMjAxNS0wNC0yMyAgTWlj aGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10g TWFyayBhcyBhZHZhbmNlZCB0aGUgYnVpbGQgb3B0aW9ucyB3ZSBkb24ndCB3YW50IHRvIGV4cG9z ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzNTU4 CiAK 251525 2015-04-23 18:36:48 -0700 2015-04-27 15:05:17 -0700 [CMake] Should be possible for an option to conflict with other options bug-143956-20150423203543.patch text/plain 4076 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvV2Vi S2l0RmVhdHVyZXMuY21ha2UgYi9Tb3VyY2UvY21ha2UvV2ViS2l0RmVhdHVyZXMuY21ha2UKaW5k ZXggZDZiNzc4OWIyZWQ5ZTRlNjJkN2Q5MDQ2YWQ3OTI5NDQwMDFlMGMwYS4uZWY4ZjdhODZkNTkw ZWEzY2Q5NzQxMGI5NzY4MTY2NWNmMDU3ZWY0YyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL1dl YktpdEZlYXR1cmVzLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9XZWJLaXRGZWF0dXJlcy5jbWFr ZQpAQCAtNyw2ICs3LDcgQEAgbWFjcm8oV0VCS0lUX09QVElPTl9ERUZJTkUgX25hbWUgX2Rlc2Ny aXB0aW9uIF9wdWJsaWMgX2luaXRpYWxfdmFsdWUpCiAgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxF X09QVElPTlNfREVTQ1JJUFRJT05fJHtfbmFtZX0gJHtfZGVzY3JpcHRpb259KQogICAgIHNldChf V0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lTX1BVQkxJQ18ke19uYW1lfSAke19wdWJsaWN9KQog ICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TX0lOSVRJQUxfVkFMVUVfJHtfbmFtZX0g JHtfaW5pdGlhbF92YWx1ZX0pCisgICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfJHtf bmFtZX1fQ09ORkxJQ1RTICIiKQogICAgIHNldChfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7 X25hbWV9X0RFUEVOREVOQ0lFUyAiIikKICAgICBsaXN0KEFQUEVORCBfV0VCS0lUX0FWQUlMQUJM RV9PUFRJT05TICR7X25hbWV9KQogZW5kbWFjcm8oKQpAQCAtMTYsNiArMTcsMTAgQEAgbWFjcm8o V0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUgX25hbWUgX3B1YmxpYyBfdmFsdWUpCiAg ICAgc2V0KF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNfSU5JVElBTF9WQUxVRV8ke19uYW1lfSAk e192YWx1ZX0pCiBlbmRtYWNybygpCiAKK21hY3JvKFdFQktJVF9PUFRJT05fQ09ORkxJQ1QgX25h bWUgX2NvbmZsaWN0KQorICAgIGxpc3QoQVBQRU5EIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlNf JHtfbmFtZX1fQ09ORkxJQ1RTICR7X2NvbmZsaWN0fSkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VC S0lUX09QVElPTl9ERVBFTkQgX25hbWUgX2RlcGVuZCkKICAgICBsaXN0KEFQUEVORCBfV0VCS0lU X0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0RFUEVOREVOQ0lFUyAke19kZXBlbmR9KQogZW5k bWFjcm8oKQpAQCAtMTc0LDEyICsxNzksNDAgQEAgbWFjcm8oX1dFQktJVF9PUFRJT05fRU5GT1JD RV9ERVBFTkRTIF9uYW1lKQogICAgICAgICBpZiAoTk9UICR7X2RlcGVuZGVuY3l9KQogICAgICAg ICAgICAgbWVzc2FnZShTVEFUVVMgIkRpc2FibGluZyAke19uYW1lfSBzaW5jZSAke19kZXBlbmRl bmN5fSBpcyBkaXNhYmxlZC4iKQogICAgICAgICAgICAgc2V0KCR7X25hbWV9IE9GRikKLSAgICAg ICAgICAgIHNldChfUkVTVEFSVF9ERVBFTkRFTkNZX1BST0NFU1NJTkcgVFJVRSkKKyAgICAgICAg ICAgIHNldChfT1BUSU9OX0NIQU5HRUQgVFJVRSkKICAgICAgICAgICAgIGJyZWFrICgpCiAgICAg ICAgIGVuZGlmICgpCiAgICAgZW5kZm9yZWFjaCAoKQogZW5kbWFjcm8oKQogCittYWNybyhfV0VC S0lUX09QVElPTl9FTkZPUkNFX0FMTF9ERVBFTkRTKQorICAgIHNldChfT1BUSU9OX0NIQU5HRUQg VFJVRSkKKyAgICB3aGlsZSAoJHtfT1BUSU9OX0NIQU5HRUR9KQorICAgICAgICBzZXQoX09QVElP Tl9DSEFOR0VEIEZBTFNFKQorICAgICAgICBmb3JlYWNoIChfbmFtZSAke19XRUJLSVRfQVZBSUxB QkxFX09QVElPTlN9KQorICAgICAgICAgICAgaWYgKCR7X25hbWV9KQorICAgICAgICAgICAgICAg IF9XRUJLSVRfT1BUSU9OX0VORk9SQ0VfREVQRU5EUygke19uYW1lfSkKKyAgICAgICAgICAgIGVu ZGlmICgpCisgICAgICAgIGVuZGZvcmVhY2ggKCkKKyAgICBlbmR3aGlsZSAoKQorZW5kbWFjcm8o KQorCittYWNybyhfV0VCS0lUX09QVElPTl9FTkZPUkNFX0NPTkZMSUNUUyBfbmFtZSkKKyAgICBm b3JlYWNoIChfY29uZmxpY3QgJHtfV0VCS0lUX0FWQUlMQUJMRV9PUFRJT05TXyR7X25hbWV9X0NP TkZMSUNUU30pCisgICAgICAgIGlmICgke19jb25mbGljdH0pCisgICAgICAgICAgICBtZXNzYWdl KEZBVEFMX0VSUk9SICIke19uYW1lfSBjb25mbGljdHMgd2l0aCAke19jb25mbGljdH0uIFlvdSBt dXN0IGRpc2FibGUgb25lIG9yIHRoZSBvdGhlci4iKQorICAgICAgICBlbmRpZiAoKQorICAgIGVu ZGZvcmVhY2ggKCkKK2VuZG1hY3JvKCkKKworbWFjcm8oX1dFQktJVF9PUFRJT05fRU5GT1JDRV9B TExfQ09ORkxJQ1RTKQorICAgIGZvcmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BU SU9OU30pCisgICAgICAgIGlmICgke19uYW1lfSkKKyAgICAgICAgICAgIF9XRUJLSVRfT1BUSU9O X0VORk9SQ0VfQ09ORkxJQ1RTKCR7X25hbWV9KQorICAgICAgICBlbmRpZiAoKQorICAgIGVuZGZv cmVhY2ggKCkKK2VuZG1hY3JvKCkKKwogbWFjcm8oV0VCS0lUX09QVElPTl9FTkQpCiAgICAgbGlz dChTT1JUIF9XRUJLSVRfQVZBSUxBQkxFX09QVElPTlMpCiAgICAgc2V0KF9NQVhfRkVBVFVSRV9M RU5HVEggMCkKQEAgLTE5NSwxNSArMjI4LDEwIEBAIG1hY3JvKFdFQktJVF9PUFRJT05fRU5EKQog ICAgICAgICBlbmRpZiAoKQogICAgIGVuZGZvcmVhY2ggKCkKIAotICAgIHNldChfUkVTVEFSVF9E RVBFTkRFTkNZX1BST0NFU1NJTkcgVFJVRSkKLSAgICB3aGlsZSAoJHtfUkVTVEFSVF9ERVBFTkRF TkNZX1BST0NFU1NJTkd9KQotICAgICAgICBzZXQoX1JFU1RBUlRfREVQRU5ERU5DWV9QUk9DRVNT SU5HIEZBTFNFKQotICAgICAgICBmb3JlYWNoIChfbmFtZSAke19XRUJLSVRfQVZBSUxBQkxFX09Q VElPTlN9KQotICAgICAgICAgICAgaWYgKCR7X25hbWV9KQotICAgICAgICAgICAgICAgIF9XRUJL SVRfT1BUSU9OX0VORk9SQ0VfREVQRU5EUygke19uYW1lfSkKLSAgICAgICAgICAgIGVuZGlmICgp Ci0gICAgICAgIGVuZGZvcmVhY2ggKCkKLSAgICBlbmR3aGlsZSAoKQorICAgICMgUnVuIHRocm91 Z2ggZXZlcnkgcG9zc2libGUgZGVwZW5kcyB0byBtYWtlIHN1cmUgd2UgaGF2ZSBkaXNhYmxlZCBh bnl0aGluZworICAgICMgdGhhdCBjb3VsZCBjYXVzZSBhbiB1bm5lY2Vzc2FyeSBjb25mbGljdCBi ZWZvcmUgcHJvY2Vzc2luZyBjb25mbGljdHMuCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9B TExfREVQRU5EUygpCisgICAgX1dFQktJVF9PUFRJT05fRU5GT1JDRV9BTExfQ09ORkxJQ1RTKCkK IAogICAgIGZvcmVhY2ggKF9uYW1lICR7X1dFQktJVF9BVkFJTEFCTEVfT1BUSU9OU30pCiAgICAg ICAgIGlmICgke19uYW1lfSkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRl eCA2ODQwMGVjMzg5ODUxMDExNmM0OWE3OGViZmE2NDM5Njc2YWUxODczLi42MmM1MzFlMjgxZTNi YjIxYWZiZDM1NDg2YjkxMzdiYjIwMzI4ZTdlIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTYgQEAKIDIwMTUtMDQtMjMgIE1pY2hhZWwgQ2F0YW56YXJv ICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCisgICAgICAgIFtDTWFrZV0gU2hvdWxkIGJlIHBv c3NpYmxlIGZvciBhbiBvcHRpb24gdG8gY29uZmxpY3Qgd2l0aCBvdGhlciBvcHRpb25zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM5NTYKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgV0VCS0lUX09Q VElPTl9DT05GTElDVCBtYWNybywgd2hpY2ggZmFpbHMgdGhlIGJ1aWxkIGlmIGNvbmZsaWN0aW5n IG9wdGlvbnMgYXJlIG9uLgorCisgICAgICAgICogU291cmNlL2NtYWtlL1dlYktpdEZlYXR1cmVz LmNtYWtlOgorCisyMDE1LTA0LTIzICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdh bGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBNYXJrIGFzIGFkdmFuY2VkIHRoZSBidWlsZCBvcHRp b25zIHdlIGRvbid0IHdhbnQgdG8gZXhwb3NlCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDM1NTgKIAo=