summaryrefslogtreecommitdiffstats
path: root/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch
diff options
context:
space:
mode:
authorTadao Tanikawa <tanikawa.tadao@jp.panasonic.com>2015-11-13 16:11:35 +0900
committerGerrit Code Review <gerrit@172.30.200.200>2015-11-13 20:17:58 +0000
commit1cabebe572defd64c998c484b623d8d7ad31b93e (patch)
treec2e7594665862a3d4e00a660dcc03c924457a4dc /meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch
parent9494cf383ad66063fcbc58f9c36fa9e48f479f5e (diff)
Update AMB with amb-qt(qml) plugins to latest
To use CogentEmbedded fixes to amb-qt(qml) plugins of AMB, the recipes for AMB has been updated: - Pulling CogentEmbeeded's repository as upstream - Apply some patches to fix some issue around amb-qt plugins (these are from branch 'dev_0.14_2') Change-Id: I81bf63d26446ec720343c4730fdc41d65ecf2e68 Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Diffstat (limited to 'meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch')
-rw-r--r--meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch
new file mode 100644
index 000000000..92a119849
--- /dev/null
+++ b/meta-ivi-common/recipes-automotive/automotive-message-broker/automotive-message-broker/0002-Fix-library-versioning.patch
@@ -0,0 +1,46 @@
+From 38c2869f16356ac723712020903ddf27cbf5890d Mon Sep 17 00:00:00 2001
+From: Petr Nechaev <petr.nechaev@cogentembedded.com>
+Date: Tue, 28 Jul 2015 17:05:10 +0300
+Subject: [PATCH 2/9] Fix library versioning
+
+Preferred for Yocto builds
+---
+ plugins/common/CMakeLists.txt | 2 ++
+ plugins/dbus/amb-qt/CMakeLists.txt | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/plugins/common/CMakeLists.txt b/plugins/common/CMakeLists.txt
+index 407b281..b760671 100644
+--- a/plugins/common/CMakeLists.txt
++++ b/plugins/common/CMakeLists.txt
+@@ -6,6 +6,7 @@ set(plugins_common_headers_install abstractio.hpp serialport.hpp bluetooth.hpp b
+ canobserver.h logger.h mutex.h thread.h dbusexport.h dbusplugin.h abstractdbusinterface.h dbussignaller.h varianttype.h)
+
+ add_library(amb-plugins-common SHARED ${plugins_common_sources})
++set_target_properties(amb-plugins-common PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+ pkg_check_modules(gio-unix REQUIRED gio-unix-2.0)
+
+@@ -25,6 +26,7 @@ set(amb_json_protocol_sources jsonprotocol.cpp)
+ set(amb_json_protocol_headers jsonprotocol.cpp)
+
+ add_library(amb-json-protocol SHARED ${amb_json_protocol_sources})
++set_target_properties(amb-json-protocol PROPERTIES SOVERSION ${PROJECT_VERSION})
+
+ target_link_libraries(amb-json-protocol amb -L${CMAKE_BINARY_DIR}/lib ${link_libraries} -L${CMAKE_CURRENT_BINARY_DIR} amb-plugins-common)
+
+diff --git a/plugins/dbus/amb-qt/CMakeLists.txt b/plugins/dbus/amb-qt/CMakeLists.txt
+index a1ae739..2f2a2a8 100644
+--- a/plugins/dbus/amb-qt/CMakeLists.txt
++++ b/plugins/dbus/amb-qt/CMakeLists.txt
+@@ -22,6 +22,7 @@ set(ambqtquick_headers ambqtquick.h)
+ include_directories(${CMAKE_SOURCE_DIR}/lib ${include_dirs} ${QT_INCLUDE_DIRS})
+
+ add_library(amb-qt SHARED ${ambqt_sources} ${ambqt_headers_moc})
++set_target_properties(amb-qt PROPERTIES SOVERSION ${PROJECT_VERSION})
+ add_library(ambqtquick MODULE ${ambqtquick_sources} ${ambqtquick_headers_moc})
+
+ target_link_libraries(amb-qt amb ${QT_LIBRARIES} -L${CMAKE_CURRENT_BINARY_DIR}/lib ${link_libraries} ${gio_LIBRARIES})
+--
+1.9.1
+