aboutsummaryrefslogtreecommitdiffstats
path: root/meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2017-01-18 15:05:05 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2017-01-18 15:05:05 +0900
commit978c6cfa7b9d072167083c3d17ccc9f89f038c2d (patch)
tree0966fe344ea7d393f54e7b34e92fc205befa8ba0 /meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch
parente20eca9f6d67e20d6a0b8a1ee63ac8f5efc18d5e (diff)
Update app-core and add sensordupdate-appmgr3rd
from: d86d0066b93cf402badc408de591e54d6db6c164 to : 73f688b07dab4d695cc1f7bee4eec6701500eab4 Add sensord because app-core needs sensord instead of sensor. Change-Id: I8f342c9dae12c27f730080edea57126bc39ffc1b Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
Diffstat (limited to 'meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch')
-rw-r--r--meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch219
1 files changed, 219 insertions, 0 deletions
diff --git a/meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch b/meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch
new file mode 100644
index 0000000..ce0bb47
--- /dev/null
+++ b/meta-application-manager/recipes-others/sensord/files/0002-Fix-libinstalldir.patch
@@ -0,0 +1,219 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ad539ca..5cd0bea 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,7 +5,7 @@ include(GNUInstallDirs)
+ # Setup For pkgconfig File
+ SET(PREFIX ${CMAKE_INSTALL_PREFIX})
+ SET(EXEC_PREFIX "${PREFIX}/bin")
+-SET(LIBDIR "${PREFIX}/${CMAKE_INSTALL_LIBDIR}")
++SET(LIBDIR "${PREFIX}/lib")
+ SET(INCLUDEDIR "${PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
+ SET(VERSION 1.0)
+
+@@ -16,7 +16,7 @@ MESSAGE("FLAGS: ${CMAKE_CXX_FLAGS}")
+ MESSAGE("FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
+
+ add_definitions(-DUSE_DLOG_LOG)
+-add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}")
++add_definitions(-DLIBDIR="${LIBDIR}")
+
+ # Internal Debugging Options
+ #add_definitions(-Wall -g -D_DEBUG)
+diff --git a/src/accel/CMakeLists.txt b/src/accel/CMakeLists.txt
+index a37c89c..2f98f37 100755
+--- a/src/accel/CMakeLists.txt
++++ b/src/accel/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${accel_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${accel_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/auto_rotation/CMakeLists.txt b/src/auto_rotation/CMakeLists.txt
+index a0076b2..121c265 100644
+--- a/src/auto_rotation/CMakeLists.txt
++++ b/src/auto_rotation/CMakeLists.txt
+@@ -25,4 +25,4 @@ add_library(${SENSOR_NAME} SHARED
+
+ target_link_libraries(${SENSOR_NAME} ${auto_rot_pkgs_LDFLAGS} "-lm")
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/geo/CMakeLists.txt b/src/geo/CMakeLists.txt
+index c6d4aa1..0c593c5 100755
+--- a/src/geo/CMakeLists.txt
++++ b/src/geo/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${geo_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${geo_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/gravity/CMakeLists.txt b/src/gravity/CMakeLists.txt
+index e66964e..69ae097 100755
+--- a/src/gravity/CMakeLists.txt
++++ b/src/gravity/CMakeLists.txt
+@@ -23,4 +23,4 @@ add_library(${SENSOR_NAME} SHARED
+
+ target_link_libraries(${SENSOR_NAME} ${gravity_pkgs_LDFLAGS} "-lm")
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/gyro/CMakeLists.txt b/src/gyro/CMakeLists.txt
+index 228fac9..f2ce149 100755
+--- a/src/gyro/CMakeLists.txt
++++ b/src/gyro/CMakeLists.txt
+@@ -28,5 +28,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${gyro_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${gyro_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/libsensord/CMakeLists.txt b/src/libsensord/CMakeLists.txt
+index 5b57251..f507c93 100755
+--- a/src/libsensord/CMakeLists.txt
++++ b/src/libsensord/CMakeLists.txt
+@@ -34,7 +34,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
+ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
+
+ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
+-install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
++install(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries)
+ install(FILES sensor.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+ install(FILES sensor_internal_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+ install(FILES sensor_internal.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+@@ -59,4 +59,4 @@ install(FILES sensor_rv.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+ install(FILES sensor_temperature.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+ install(FILES sensor_motion.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+ install(FILES sensor_deprecated.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor/)
+-install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
+diff --git a/src/light/CMakeLists.txt b/src/light/CMakeLists.txt
+index 099ff82..759cba7 100755
+--- a/src/light/CMakeLists.txt
++++ b/src/light/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${light_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${light_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/linear_accel/CMakeLists.txt b/src/linear_accel/CMakeLists.txt
+index 986fb11..52a573a 100755
+--- a/src/linear_accel/CMakeLists.txt
++++ b/src/linear_accel/CMakeLists.txt
+@@ -24,4 +24,4 @@ add_library(${SENSOR_NAME} SHARED
+
+ target_link_libraries(${SENSOR_NAME} ${linear_accel_pkgs_LDFLAGS} "-lm")
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/orientation/CMakeLists.txt b/src/orientation/CMakeLists.txt
+index 6f02e9a..e7ef28a 100755
+--- a/src/orientation/CMakeLists.txt
++++ b/src/orientation/CMakeLists.txt
+@@ -24,4 +24,4 @@ add_library(${SENSOR_NAME} SHARED
+
+ target_link_libraries(${SENSOR_NAME} ${orientation_pkgs_LDFLAGS} "-lm")
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/pressure/CMakeLists.txt b/src/pressure/CMakeLists.txt
+index e61aca4..9eb8df8 100755
+--- a/src/pressure/CMakeLists.txt
++++ b/src/pressure/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${pressure_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${pressure_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/proxi/CMakeLists.txt b/src/proxi/CMakeLists.txt
+index 7cd4517..e05cc43 100755
+--- a/src/proxi/CMakeLists.txt
++++ b/src/proxi/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${proxi_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${proxi_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/rotation_vector/rv/CMakeLists.txt b/src/rotation_vector/rv/CMakeLists.txt
+index d26d4f9..6e0e386 100755
+--- a/src/rotation_vector/rv/CMakeLists.txt
++++ b/src/rotation_vector/rv/CMakeLists.txt
+@@ -24,4 +24,4 @@ add_library(${SENSOR_NAME} SHARED
+
+ target_link_libraries(${SENSOR_NAME} ${rv_pkgs_LDFLAGS} "-lm")
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/rotation_vector/rv_raw/CMakeLists.txt b/src/rotation_vector/rv_raw/CMakeLists.txt
+index 223b8c8..e83a639 100755
+--- a/src/rotation_vector/rv_raw/CMakeLists.txt
++++ b/src/rotation_vector/rv_raw/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${rv_raw_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${rv_raw_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/sensor_fusion/CMakeLists.txt b/src/sensor_fusion/CMakeLists.txt
+index c38f410..526b396 100755
+--- a/src/sensor_fusion/CMakeLists.txt
++++ b/src/sensor_fusion/CMakeLists.txt
+@@ -35,4 +35,4 @@ add_library(${SENSOR_FUSION_NAME} SHARED
+
+ target_link_libraries(${SENSOR_FUSION_NAME} ${rpkgs_LDFLAGS} ${GLES_LDFLAGS} "-lm")
+
+-install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_FUSION_NAME} DESTINATION ${LIBDIR}/sensord)
+diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
+index f400944..3b37bb6 100755
+--- a/src/shared/CMakeLists.txt
++++ b/src/shared/CMakeLists.txt
+@@ -51,10 +51,10 @@ target_link_libraries(sensord-share ${shared_pkgs_LDFLAGS} "-lrt -ldl -pthread")
+ configure_file(sensord-server.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/sensord-server.pc @ONLY)
+ configure_file(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
+
+-install(TARGETS sensord-server DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-install(TARGETS sensord-share DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-install(FILES sensord-server.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+-install(FILES ${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(TARGETS sensord-server DESTINATION ${LIBDIR})
++install(TARGETS sensord-share DESTINATION ${LIBDIR})
++install(FILES sensord-server.pc DESTINATION ${LIBDIR}/pkgconfig)
++install(FILES ${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
+ install(FILES
+ crw_lock.h
+ worker_thread.h
+diff --git a/src/temperature/CMakeLists.txt b/src/temperature/CMakeLists.txt
+index 87dab53..26e03c9 100755
+--- a/src/temperature/CMakeLists.txt
++++ b/src/temperature/CMakeLists.txt
+@@ -29,5 +29,5 @@ add_library(${SENSOR_HAL_NAME} SHARED
+ target_link_libraries(${SENSOR_NAME} ${temp_pkgs_LDFLAGS} "-lm")
+ target_link_libraries(${SENSOR_HAL_NAME} ${temp_pkgs_LDFLAGS})
+
+-install(TARGETS ${SENSOR_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
+-install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR}/sensord)
++install(TARGETS ${SENSOR_NAME} DESTINATION ${LIBDIR}/sensord)
++install(TARGETS ${SENSOR_HAL_NAME} DESTINATION ${LIBDIR}/sensord)
+--
+1.9.1
+