From ce9e8acb09307150ee2913eb60f8eedfa0e35037 Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Fri, 12 May 2017 15:08:56 +0900 Subject: [PATCH] Fix build issue on 64bit environment Change-Id: I95653b356fe68d8125262b32b2d21c903d21f85b Signed-off-by: Jiwan Kim --- packaging/zigbee-manager.spec | 13 ++++++++----- zigbee-client/CMakeLists.txt | 4 ++-- zigbee-client/zigbee-client.pc.in | 2 +- zigbee-daemon/CMakeLists.txt | 4 ++-- zigbee-daemon/zigbee-lib/CMakeLists.txt | 2 +- zigbee-daemon/zigbee-lib/src/zblib_request.c | 6 +++--- zigbee-daemon/zigbee-lib/src/zblib_service.c | 2 +- zigbee-daemon/zigbee-lib/zigbee-lib.pc.in | 2 +- 8 files changed, 19 insertions(+), 16 deletions(-) diff --git a/packaging/zigbee-manager.spec b/packaging/zigbee-manager.spec index 19fb9fc..79e1b2a 100644 --- a/packaging/zigbee-manager.spec +++ b/packaging/zigbee-manager.spec @@ -50,7 +50,10 @@ cp -a %{SOURCE2} . %endif %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DVERSION=%{version} \ +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DVERSION=%{version} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DUNIT_INSTALL_DIR=%{_unitdir} \ make %{?_smp_mflags} @@ -58,8 +61,8 @@ make %{?_smp_mflags} %make_install # Do not execute daemon on boot time -#mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants -#ln -s %{_libdir}/systemd/system/zigbee-daemon.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service +#mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants +#ln -s %{_unitdir}/zigbee-daemon.service %{buildroot}%{_unitdir}/multi-user.target.wants/zigbee-daemon.service mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/ mkdir -p %{buildroot}%{_datadir}/dbus-1/system.d/ @@ -76,8 +79,8 @@ cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system.d/zigbee.conf %manifest zigbee-daemon.manifest %defattr(644,system,system,-) %attr(755,system,system) %{_bindir}/zigbee-daemon -%{_libdir}/systemd/system/zigbee-daemon.service -#%{_libdir}/systemd/system/multi-user.target.wants/zigbee-daemon.service +%{_unitdir}/zigbee-daemon.service +#%{_unitdir}/multi-user.target.wants/zigbee-daemon.service %{_datadir}/license/zigbee-daemon %attr(644,root,root) %{_datadir}/dbus-1/system-services/* %if %{CHECK_ZIGBEE_PRIVILEGE} == "True" diff --git a/zigbee-client/CMakeLists.txt b/zigbee-client/CMakeLists.txt index 8622e3d..aaeed6c 100644 --- a/zigbee-client/CMakeLists.txt +++ b/zigbee-client/CMakeLists.txt @@ -50,9 +50,9 @@ CONFIGURE_FILE(zigbee-client.pc.in zigbee-client.pc @ONLY) ### Install files ### INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/client) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-client.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-client.pc DESTINATION ${LIBDIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-client) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR} COMPONENT Runtime) IF (TIZEN_ENGINEER_MODE) ADD_SUBDIRECTORY(test_src) ENDIF (TIZEN_ENGINEER_MODE) diff --git a/zigbee-client/zigbee-client.pc.in b/zigbee-client/zigbee-client.pc.in index 75c7f4b..3634b35 100644 --- a/zigbee-client/zigbee-client.pc.in +++ b/zigbee-client/zigbee-client.pc.in @@ -1,6 +1,6 @@ prefix=@PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@LIBDIR@ includedir=${prefix}/include Name: ZigBee Client Library diff --git a/zigbee-daemon/CMakeLists.txt b/zigbee-daemon/CMakeLists.txt index 4ac2665..09a577f 100644 --- a/zigbee-daemon/CMakeLists.txt +++ b/zigbee-daemon/CMakeLists.txt @@ -101,7 +101,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} ${ZIGBEE_LIB_SRCS}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} zigbee-service zigbee-interface ${pkgs_LDFLAGS} "-ldl") ### Install files ### -INSTALL(TARGETS zigbee-lib DESTINATION lib COMPONENT Runtime) +INSTALL(TARGETS zigbee-lib DESTINATION ${LIBDIR} COMPONENT Runtime) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-daemon) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/zigbee-daemon.service DESTINATION /usr/lib/systemd/system) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/resources/zigbee-daemon.service DESTINATION ${UNITDIR}) diff --git a/zigbee-daemon/zigbee-lib/CMakeLists.txt b/zigbee-daemon/zigbee-lib/CMakeLists.txt index 352d5c1..fb40778 100644 --- a/zigbee-daemon/zigbee-lib/CMakeLists.txt +++ b/zigbee-daemon/zigbee-lib/CMakeLists.txt @@ -39,6 +39,6 @@ CONFIGURE_FILE(zigbee-lib.pc.in zigbee-lib.pc @ONLY) ### Install files ### INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/zigbee/lib) INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/common/include/ DESTINATION include/zigbee/common) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-lib.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zigbee-lib.pc DESTINATION ${LIBDIR}/pkgconfig) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME zigbee-lib) #INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib COMPONENT Runtime) diff --git a/zigbee-daemon/zigbee-lib/src/zblib_request.c b/zigbee-daemon/zigbee-lib/src/zblib_request.c index 2df88f0..f23f3e5 100644 --- a/zigbee-daemon/zigbee-lib/src/zblib_request.c +++ b/zigbee-daemon/zigbee-lib/src/zblib_request.c @@ -87,7 +87,7 @@ static ZigBeeRequest *__zblib_request_ref_request_by_by_request_id(ZigBeeService } /* Look-up requets_id in request hash table */ - request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)request_id); + request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)GUINT_TO_POINTER(request_id)); if (NULL == request) { Z_LOGE("No request available for request_id: [%d]", request_id); return NULL; @@ -125,7 +125,7 @@ static ZigBeeRequest *__zblib_request_ref_request_by_request_id(ZigBeeService *s } /* Look-up requets_id in request hash table */ - request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)request_id); + request = (ZigBeeRequest *)g_hash_table_lookup(request_table, (gconstpointer)GUINT_TO_POINTER(request_id)); if (NULL == request) { Z_LOGE("No request available for request_id: [%d]", request_id); return NULL; @@ -4597,7 +4597,7 @@ gint zblib_request_new(ZigBeeServiceInterface *service_interface, } /* Insert request to request table */ - g_hash_table_insert(request_table, (gpointer)(request->request_id), request); + g_hash_table_insert(request_table, GINT_TO_POINTER(request->request_id), request); return request->request_id; } diff --git a/zigbee-daemon/zigbee-lib/src/zblib_service.c b/zigbee-daemon/zigbee-lib/src/zblib_service.c index ff46159..045b651 100644 --- a/zigbee-daemon/zigbee-lib/src/zblib_service.c +++ b/zigbee-daemon/zigbee-lib/src/zblib_service.c @@ -256,7 +256,7 @@ static void __zblib_service_remove_request_table_iter(gpointer key, gpointer value, gpointer user_data) { ZigBeeServiceInterface *service_interface = (ZigBeeServiceInterface *)user_data; - gint request_id = (gint)key; + gint request_id = GPOINTER_TO_INT(key); NOT_USED(value); diff --git a/zigbee-daemon/zigbee-lib/zigbee-lib.pc.in b/zigbee-daemon/zigbee-lib/zigbee-lib.pc.in index 444788e..4faa1b8 100644 --- a/zigbee-daemon/zigbee-lib/zigbee-lib.pc.in +++ b/zigbee-daemon/zigbee-lib/zigbee-lib.pc.in @@ -1,6 +1,6 @@ prefix=@PREFIX@ exec_prefix=${prefix} -libdir=${exec_prefix}/lib +libdir=@LIBDIR@ includedir=${prefix}/include Name: lib-zigbee -- 2.7.4