0001-fix-taglib-config-file-for-cross-compiling-906.patch 2.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. From 7470f92a67375d00e53b3785a88fa7b26ad6f1da Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
  3. Date: Fri, 17 May 2019 13:13:35 +0200
  4. Subject: [PATCH] fix taglib-config file for cross compiling (#906)
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. The current taglib-config program does not work for cross-compiling as it only
  9. returns the paths to the host, which breaks building programs which uses
  10. `taglib-config` to link against taglib.
  11. Fix this by passing sysroot to the `prefix` and `exec_prefix` fields.
  12. Backported from: 7470f92a67375d00e53b3785a88fa7b26ad6f1da
  13. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
  14. ---
  15. CMakeLists.txt | 2 +-
  16. taglib-config.cmake | 10 +++++-----
  17. 2 files changed, 6 insertions(+), 6 deletions(-)
  18. diff --git a/CMakeLists.txt b/CMakeLists.txt
  19. index 2de06324..1a0302c4 100644
  20. --- a/CMakeLists.txt
  21. +++ b/CMakeLists.txt
  22. @@ -105,7 +105,7 @@ math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
  23. include(ConfigureChecks.cmake)
  24. if(NOT WIN32)
  25. - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config")
  26. + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" @ONLY)
  27. install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}")
  28. endif()
  29. diff --git a/taglib-config.cmake b/taglib-config.cmake
  30. index 2bc2811a..96ef6883 100644
  31. --- a/taglib-config.cmake
  32. +++ b/taglib-config.cmake
  33. @@ -14,10 +14,10 @@ EOH
  34. exit 1;
  35. }
  36. -prefix=${CMAKE_INSTALL_PREFIX}
  37. -exec_prefix=${CMAKE_INSTALL_PREFIX}
  38. -libdir=${LIB_INSTALL_DIR}
  39. -includedir=${INCLUDE_INSTALL_DIR}
  40. +prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@
  41. +exec_prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@
  42. +libdir=${exec_prefix}/lib
  43. +includedir=${prefix}/include
  44. flags=""
  45. @@ -35,7 +35,7 @@ do
  46. flags="$flags -I$includedir/taglib"
  47. ;;
  48. --version)
  49. - echo ${TAGLIB_LIB_VERSION_STRING}
  50. + echo @TAGLIB_LIB_VERSION_STRING@
  51. ;;
  52. --prefix)
  53. echo $prefix
  54. --
  55. 2.22.0