You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

33 lines
1.1 KiB

  1. From db2c4f357432ee18975a69af71f50ed415584829 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Thu, 17 Dec 2020 20:54:48 -0800
  4. Subject: [PATCH] remove CMAKE_THREAD_LIBS_INIT from pkgconfig CFLAGS
  5. This is a linker flag and does not belong in CFLAGS.
  6. Fixes an issue with ola and protobuf.
  7. Signed-off-by: Rosen Penev <rosenp@gmail.com>
  8. ---
  9. cmake/protobuf-lite.pc.cmake | 2 +-
  10. cmake/protobuf.pc.cmake | 2 +-
  11. 2 files changed, 2 insertions(+), 2 deletions(-)
  12. --- a/cmake/protobuf-lite.pc.cmake
  13. +++ b/cmake/protobuf-lite.pc.cmake
  14. @@ -7,5 +7,5 @@ Name: Protocol Buffers
  15. Description: Google's Data Interchange Format
  16. Version: @protobuf_VERSION@
  17. Libs: -L${libdir} -lprotobuf-lite @CMAKE_THREAD_LIBS_INIT@
  18. -Cflags: -I${includedir} @CMAKE_THREAD_LIBS_INIT@
  19. +Cflags: -I${includedir}
  20. Conflicts: protobuf
  21. --- a/cmake/protobuf.pc.cmake
  22. +++ b/cmake/protobuf.pc.cmake
  23. @@ -7,5 +7,5 @@ Name: Protocol Buffers
  24. Description: Google's Data Interchange Format
  25. Version: @protobuf_VERSION@
  26. Libs: -L${libdir} -lprotobuf @CMAKE_THREAD_LIBS_INIT@
  27. -Cflags: -I${includedir} @CMAKE_THREAD_LIBS_INIT@
  28. +Cflags: -I${includedir}
  29. Conflicts: protobuf-lite