0002-fix-build-error-with-newer-cmake.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. From c90ae2ca3dff267b9e21595376d22de397f6f78f Mon Sep 17 00:00:00 2001
  2. From: Ryan Coe <bluemrp9@gmail.com>
  3. Date: Tue, 20 Aug 2019 06:22:43 -0700
  4. Subject: [PATCH] Fix build error with newer cmake
  5. Fixes the following build error:
  6. CMake Error at cmake/os/Linux.cmake:29 (STRING):
  7. STRING sub-command REPLACE requires at least four arguments.
  8. Call Stack (most recent call first):
  9. CMakeLists.txt:101 (INCLUDE)
  10. CMake Error at cmake/os/Linux.cmake:29 (STRING):
  11. STRING sub-command REPLACE requires at least four arguments.
  12. Call Stack (most recent call first):
  13. CMakeLists.txt:101 (INCLUDE)
  14. https://jira.mariadb.org/browse/MDEV-20596
  15. Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
  16. ---
  17. cmake/os/Linux.cmake | 6 +++---
  18. 1 file changed, 3 insertions(+), 3 deletions(-)
  19. diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake
  20. index 50a2b21c838d8d6ca4cacc0704a9be4da3a57a0a..b871586acc9cfaddc3836cc9afafd85969120420 100644
  21. --- a/cmake/os/Linux.cmake
  22. +++ b/cmake/os/Linux.cmake
  23. @@ -26,9 +26,9 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE=1)
  24. # Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
  25. FOREACH(LANG C CXX)
  26. - STRING(REPLACE "-rdynamic" ""
  27. - CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS
  28. - ${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}
  29. + STRING(REPLACE "-rdynamic" ""
  30. + "CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS"
  31. + "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}"
  32. )
  33. ENDFOREACH()
  34. --
  35. 2.17.1