diff options
| -rw-r--r-- | meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch | 60 | ||||
| -rw-r--r-- | meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb | 1 |
2 files changed, 61 insertions, 0 deletions
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch new file mode 100644 index 0000000..3f2c2ef --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch @@ -0,0 +1,60 @@ +From d214197c418945f8ae8ad72a7173c6b83a808ef0 Mon Sep 17 00:00:00 2001 +From: Clement Dransart <clement.dransart@awtce.be> +Date: Fri, 17 Jun 2016 10:40:36 +0200 +Subject: [audiomanager][PATCH] audiomanager: fix lib install path for multilib + +Signed-off-by: Clement Dransart <clement.dransart@awtce.be> +--- + CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4e3cb5..0004b07 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS) + endif(NOT DEFINED CONTROLLER_PLUGIN) + else(USE_BUILD_LIBS) + if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) +- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") ++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") + endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) +- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") ++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") + endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + if(NOT DEFINED CONTROLLER_PLUGIN) +- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") ++ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so") + endif(NOT DEFINED CONTROLLER_PLUGIN) + endif(USE_BUILD_LIBS) + +@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + + configure_package_config_file ( + ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake +- INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + PATH_VARS AUDIO_INCLUDE_FOLDER ) + + write_basic_package_version_file( +@@ -237,14 +237,14 @@ write_basic_package_version_file( + COMPATIBILITY SameMajorVersion ) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake +- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake + COMPONENT dev) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} + COMPONENT dev) + + configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY ) +-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) ++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) + + add_subdirectory (AudioManagerDaemon) + +-- +1.9.1 + diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb index 5a97540..2208d00 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -13,6 +13,7 @@ SRC_URI = " \ git://git.projects.genivi.org/AudioManager.git;branch=master \ file://AudioManager.service \ file://setup_amgr.sh \ + file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ " S = "${WORKDIR}/git" |