0032-llvm-Do-not-use-cmake-infra-to-detect-libzstd.patch 2.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. From ab07bcf103432f49aeff486e2898110c879e8bc0 Mon Sep 17 00:00:00 2001
  2. From: Khem Raj <raj.khem@gmail.com>
  3. Date: Fri, 12 Aug 2022 11:50:57 -0700
  4. Subject: [PATCH] llvm: Do not use cmake infra to detect libzstd
  5. OE's version is build using plain make not cmake as a result we do not
  6. have the cmake support files and this probing method can get this info
  7. from build host and force linking with libzstd from /usr/lib which is
  8. not what we want when cross building.
  9. Fixes errors building llvm-config like
  10. /usr/lib/libzstd.so.1.5.2: error adding symbols: file in wrong
  11. format
  12. | clang-15: error: linker command failed with exit code 1 (use -v to see invocation)
  13. | ninja: build stopped: subcommand failed.
  14. Upstream-Status: Inappropriate [OE-Specific]
  15. Signed-off-by: Khem Raj <raj.khem@gmail.com>
  16. ---
  17. llvm/lib/Support/CMakeLists.txt | 8 ++++----
  18. 1 file changed, 4 insertions(+), 4 deletions(-)
  19. diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt
  20. index 8fbb2ca4c164..a6daa7c9f20f 100644
  21. --- a/llvm/lib/Support/CMakeLists.txt
  22. +++ b/llvm/lib/Support/CMakeLists.txt
  23. @@ -22,7 +22,7 @@ if (HAS_WERROR_GLOBAL_CTORS)
  24. endif()
  25. if(LLVM_ENABLE_ZLIB)
  26. - list(APPEND imported_libs ZLIB::ZLIB)
  27. + list(APPEND imported_libs z)
  28. endif()
  29. if(LLVM_ENABLE_ZSTD)
  30. @@ -34,7 +34,7 @@ if(LLVM_ENABLE_ZSTD)
  31. endif()
  32. if(LLVM_ENABLE_ZSTD)
  33. - list(APPEND imported_libs ${zstd_target})
  34. + list(APPEND imported_libs zstd)
  35. endif()
  36. if( MSVC OR MINGW )
  37. @@ -291,7 +291,7 @@ if(LLVM_ENABLE_ZLIB)
  38. get_property(zlib_library TARGET ZLIB::ZLIB PROPERTY LOCATION)
  39. endif()
  40. get_library_name(${zlib_library} zlib_library)
  41. - set(llvm_system_libs ${llvm_system_libs} "${zlib_library}")
  42. + set(llvm_system_libs ${llvm_system_libs} z)
  43. endif()
  44. if(LLVM_ENABLE_ZSTD)
  45. @@ -304,7 +304,7 @@ if(LLVM_ENABLE_ZSTD)
  46. get_property(zstd_library TARGET ${zstd_target} PROPERTY LOCATION)
  47. endif()
  48. get_library_name(${zstd_library} zstd_library)
  49. - set(llvm_system_libs ${llvm_system_libs} "${zstd_library}")
  50. + set(llvm_system_libs ${llvm_system_libs} zstd)
  51. endif()
  52. if(LLVM_ENABLE_TERMINFO)