[Bluetooth-OAL] Jira issue : TFIVE-26

LIB path not defined for 64bit architecture .
Added changes in the spec file and
defined path for lib64 .

Change-Id: I42f4f5721b0b6a66aa061742b2ed8a1540c98181
Signed-off-by: Abhishek Chandra <abhishek.ch@samsung.com>

diff --git a/bt-oal/hardware/hardware.c b/bt-oal/hardware/hardware.c
index 75e605e..230f19a 100644 (file)
--- a/bt-oal/hardware/hardware.c
+++ b/bt-oal/hardware/hardware.c
@@ -35,7 +35,11 @@
 #define warn(fmt, arg...) ALOG(LOG_WARN, LOG_TAG, fmt, ##arg)
 #define error(fmt, arg...) ALOG(LOG_ERROR, LOG_TAG, fmt, ##arg)
 
-#define HAL_LIBRARY_PATH "/usr/lib"
+#ifdef ARCH64
+#define HAL_LIBRARY_PATH               "/usr/lib64"
+#else
+#define HAL_LIBRARY_PATH               "/usr/lib"
+#endif
 
 /**
  * Load the file defined by the variant and if successful

diff --git a/bt-oal/oal-manager.c b/bt-oal/oal-manager.c
old mode 100755 (executable)
new mode 100644 (file)
index cd1a39f..83a4ab5
--- a/bt-oal/oal-manager.c
+++ b/bt-oal/oal-manager.c
@@ -32,7 +32,13 @@
 #include <oal-hardware.h>
 
 #define BT_HAL_LIB_NAME                        "libbluetooth.default.so"
+
+#ifdef ARCH64
+#define HAL_LIBRARY_PATH               "/usr/lib64"
+#else
 #define HAL_LIBRARY_PATH               "/usr/lib"
+#endif
+
 #define LIB_PATH_SIZE                  50
 #define LIB_NAME_SIZE                  50
 

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index 5d6a9ba..d94404f 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -314,6 +314,13 @@ export CFLAGS="$CFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 export CXXFLAGS="$CXXFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 export FFLAGS="$FFLAGS_DEFAULT -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 
+%ifarch aarch64
+echo arch64
+export CFLAGS+=" -DARCH64"
+export CXXFLAGS+=" -DARCH64"
+export FFLAGS+=" -DARCH64"
+%endif
+
 cmake . -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_LIB_DIR=%{_libdir} \
 -DTZ_SYS_USER_GROUP=%TZ_SYS_USER_GROUP \