iot 64bit testhub issue fix

Change-Id: I446a277143ee9235f984c2480bb49cb63c1ed187
Signed-off-by: kamaljeet chauhan <kamal.jc@samsung.com>

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index f0621e29e3d34ef3b83b625bccc00feb2bddfec7..d06bfd454b2e981eb312f0403c8b87335ebd7f94 100644 (file)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -22,6 +22,7 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--hash-style=both -pie")
 ADD_DEFINITIONS("-DPHN_DBUS_INTERFACE=\"${DBUS_INTERFACE}\"")
+ADD_DEFINITIONS("-DPHND_LIB_DIR=\"${PHND_LIB_DIR}\"")
 ADD_DEFINITIONS("-DPHND_SYS_DB=\"${PHND_SYS_DB}\"")
 ADD_DEFINITIONS("-D_PHONENUMBER_UTILS_DBUS_SERVER")
 

diff --git a/daemon/phnd-libphonenumber.cpp b/daemon/phnd-libphonenumber.cpp
index 094061d449ce77c4f7e7aa03a464226efb95771a..b191a11297cf569ccc0bb2331fb845e8be12c38f 100755 (executable)
--- a/daemon/phnd-libphonenumber.cpp
+++ b/daemon/phnd-libphonenumber.cpp
@@ -29,7 +29,7 @@
 #include "phnd-libphonenumber.h"
 
 #define MCC_LEN 3
-#define LIBRARY_PATH "/usr/lib/libphonenumber-utils-geocoding.so"
+#define LIBRARY_PATH PHND_LIB_DIR"/libphonenumber-utils-geocoding.so"
 
 using namespace i18n::phonenumbers;
 

diff --git a/packaging/phonenumber-utils.spec b/packaging/phonenumber-utils.spec
index e825b7a776ce3b2261f97ed5a7cfabf7425cdbba..3d133316f243b1378335b3c72340ded317a60e21 100644 (file)
--- a/packaging/phonenumber-utils.spec
+++ b/packaging/phonenumber-utils.spec
@@ -81,6 +81,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DMAJORVER=${MAJORVER} \
        -DFULLVER=%{version} \
        -DBIN_INSTALL_DIR:PATH=%{_bindir} \
+        -DPHND_LIB_DIR=%{_libdir} \
        -DPHND_SYS_DB=%{TZ_SYS_GLOBALUSER_DB} \
        -DDBUS_INTERFACE=%{_dbus_name}