diff options
| author | Junfeng <junfeng.dong@intel.com> | 2013-03-21 20:50:57 +0800 |
|---|---|---|
| committer | lifang <fangx.li@intel.com> | 2013-03-29 05:38:19 +0800 |
| commit | 3c34944a8b24081438d6894c1d5aeed0047c6e04 (patch) | |
| tree | 8100b52bad39708dea1703d7e96da9d3a8cf2f0d | |
| parent | 947ff08fb93d4b25464e9ee500fac59dd090210a (diff) | |
| download | bluetooth-tizen_2.1.tar.gz bluetooth-tizen_2.1.tar.bz2 bluetooth-tizen_2.1.zip | |
Fix for x86_64 compatibilitysubmit/tizen_2.2/20130714.144022submit/tizen_2.2/20130714.135322submit/tizen_2.1/20130424.230241accepted/tizen_2.1/20130425.0406212.1b_releasetizen_2.1
- Fix hardcoding library path
- Fix the problem of casting between pointer and int.
Change-Id: I18fdad5b63358cc37966094e9edc3124c934f851
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | capi-network-bluetooth.pc.in | 4 | ||||
| -rw-r--r-- | packaging/capi-network-bluetooth.spec | 2 | ||||
| -rw-r--r-- | test/bt_unit_test.c | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 47e3695..6ac39eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") SET(SOURCES src/bluetooth-common.c @@ -56,7 +56,7 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${fw_name} DESTINATION lib) +INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/network FILES_MATCHING @@ -73,7 +73,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc @ONLY ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) ADD_SUBDIRECTORY(test) diff --git a/capi-network-bluetooth.pc.in b/capi-network-bluetooth.pc.in index 097a2d1..85a129a 100644 --- a/capi-network-bluetooth.pc.in +++ b/capi-network-bluetooth.pc.in @@ -2,8 +2,8 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=/usr/lib -includedir=/usr/include/network +libdir=@LIB_INSTALL_DIR@ +includedir=@INCLUDE_INSTALL_DIR@/network Name: @PC_NAME@ Description: @PACKAGE_DESCRIPTION@ diff --git a/packaging/capi-network-bluetooth.spec b/packaging/capi-network-bluetooth.spec index fdd266c..7ecde77 100644 --- a/packaging/capi-network-bluetooth.spec +++ b/packaging/capi-network-bluetooth.spec @@ -35,7 +35,7 @@ Network Bluetooth Framework (DEV). %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c index 6876880..75c719e 100644 --- a/test/bt_unit_test.c +++ b/test/bt_unit_test.c @@ -446,7 +446,7 @@ void __bt_avrcp_scan_mode_changed_cb(bt_avrcp_scan_mode_e scan, void *user_data) int test_input_callback(void *data) { int ret = 0; - int test_id = (int)data; + long test_id = (long)data; switch (test_id) { case 0x00ff: @@ -1153,8 +1153,8 @@ static gboolean key_event_cb(GIOChannel *chan, { char buf[BUFFER_LEN] = { 0 }; - unsigned int len = 0; - int test_id; + gsize len = 0; + long test_id; memset(buf, 0, sizeof(buf)); |