Fix build error for 64bit emulator

Change-Id: Ice837634e19b19069b997fbba86f85dd17b3c9ca
Signed-off-by: min7.choi <min7.choi@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd7404e1065424b03e82490666e366edbd005a24..d6a75a9cf28db762654ea34d44ce1ab808f05b39 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ ENDIF()
 IF(DEVICE_ARCH STREQUAL "AARCH64")
     MESSAGE(STATUS "Device Arch: 64bit")
     ADD_DEFINITIONS("-DDEVICE_ARCH_64_BIT")
-ENDIF(DEVICE_ARCH)
+ENDIF(DEVICE_ARCH STREQUAL "AARCH64")
 
 ############################# compiler flags ##################################
 

diff --git a/packaging/wrt-service.spec b/packaging/wrt-service.spec
index 9ff0c5a9bc7ec22758017db027f470e5468a846b..9ce01640bf473fa03dfe47aaa1f00bb98662b2ba 100644 (file)
--- a/packaging/wrt-service.spec
+++ b/packaging/wrt-service.spec
@@ -1,6 +1,6 @@
 Name:       wrt-service
 Summary:    Service Model for Web Runtime
-Version:    1.0.5
+Version:    1.0.6
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0 and BSD-2-Clause

diff --git a/src/node/CMakeLists.txt b/src/node/CMakeLists.txt
index 680be17344fe7dae32be07d361d9636ac81deacb..9993db1fcfebdd921f7bd69b2324aa004c29e642 100644 (file)
--- a/src/node/CMakeLists.txt
+++ b/src/node/CMakeLists.txt
@@ -1,7 +1,15 @@
 
 ADD_DEFINITIONS("-fPIC")
 
-SET(NODE_PLUGIN_PATH /usr/lib/node/wrt-service)
+SET(BUILD_ARCH "$ENV{RPM_ARCH}")
+
+IF(${BUILD_ARCH} MATCHES "x86_64")
+    SET(NODE_PLUGIN_PATH /usr/lib64/node/wrt-service)
+ELSEIF(${BUILD_ARCH} MATCHES "aarch64")
+    SET(NODE_PLUGIN_PATH /usr/lib64/node/wrt-service)
+ELSEIF(NOT ${BUILD_ARCH} MATCHES "x86_64")
+    SET(NODE_PLUGIN_PATH /usr/lib/node/wrt-service)
+ENDIF(${BUILD_ARCH} MATCHES "x86_64")
 
 #################################### native #####################################