0004-pkg-config.py-do-not-prepend-sysroot-path.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 51e8fed854fd9d373bb9b20d7ed8e7cf6ef12312 Mon Sep 17 00:00:00 2001
  2. From: Adam Duskett <adam.duskett@amarulasolutions.com>
  3. Date: Wed, 19 Jul 2023 11:48:59 -0700
  4. Subject: [PATCH] pkg-config.py: do not prepend sysroot path
  5. Buildroot uses the standard PKG_CONFIG_SYSROOT_DIR variable, so what the
  6. pkg-config.py script is doing doesn't make sense. There is no need to prepend
  7. the sysroot, and flutter should let pkg-config use the PKG_CONFIG_SYSROOT_DIR
  8. variable.
  9. Without this patch, the pkg-config.py script double prepends the sysroot path.
  10. IE: output/host/.../sysroot/output/host/.../sysroot
  11. Upstream: https://github.com/flutter/flutter/issues/132152
  12. Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
  13. ---
  14. engine/src/build/config/linux/pkg-config.py | 4 +---
  15. 1 file changed, 1 insertion(+), 3 deletions(-)
  16. diff --git a/engine/src/build/config/linux/pkg-config.py b/engine/src/build/config/linux/pkg-config.py
  17. index b4a6aff17..44ffdcaea 100644
  18. --- a/engine/src/build/config/linux/pkg-config.py
  19. +++ b/engine/src/build/config/linux/pkg-config.py
  20. @@ -207,9 +207,7 @@ def main():
  21. all_flags = flag_string.strip().split(' ')
  22. - sysroot = options.sysroot
  23. - if not sysroot:
  24. - sysroot = ''
  25. + sysroot = ''
  26. includes = []
  27. cflags = []
  28. --
  29. 2.41.0