0002-allow-building-in-tree.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From 07d40f72e1ed1d84a5ddd98ae8490d41a2e19c46 Mon Sep 17 00:00:00 2001
  2. From: Arjan van de Ven <arjan@linux.intel.com>
  3. Date: Wed, 5 Sep 2018 11:39:01 +0000
  4. Subject: [PATCH] allow building in tree
  5. By default, spidermonkey must be configured and built out-of-tree,
  6. otherwise the following error occurs:
  7. FATAL ERROR PROCESSING MOZBUILD FILE
  8. ==============================
  9. The error occurred while processing the following file or one of the files it
  10. includes:
  11. js/src/shell/moz.build
  12. The error occurred when validating the result of the execution. The reported
  13. error is:
  14. Path specified in LOCAL_INCLUDES is not allowed:
  15. .. (resolved to js/src)
  16. Remove this check, as spidermonkey builds without issue in-tree.
  17. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
  18. Signed-off-by: Adam Duskett <aduskett@gmail.com>
  19. ---
  20. python/mozbuild/mozbuild/frontend/emitter.py | 5 -----
  21. 1 file changed, 5 deletions(-)
  22. diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
  23. index 642b381c..c37fbf5d 100644
  24. --- a/python/mozbuild/mozbuild/frontend/emitter.py
  25. +++ b/python/mozbuild/mozbuild/frontend/emitter.py
  26. @@ -1127,11 +1127,6 @@ class TreeMetadataEmitter(LoggingMixin):
  27. raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
  28. 'does not exist: %s (resolved to %s)' % (local_include,
  29. full_path), context)
  30. - if (full_path == context.config.topsrcdir or
  31. - full_path == context.config.topobjdir):
  32. - raise SandboxValidationError('Path specified in LOCAL_INCLUDES '
  33. - 'is not allowed: %s (resolved to %s)' % (local_include,
  34. - full_path), context)
  35. include_obj = LocalInclude(context, local_include)
  36. local_includes.append(include_obj.path.full_path)
  37. yield include_obj
  38. --
  39. 2.23.0