Add support i586/x86_64

Change-Id: I75aafce906398e1aec2ebb255eb266f2aa87ad47
Signed-off-by: Haesik Jun <haesik.jun@samsung.com>

diff --git a/config/tizen/packaging/iotjs.spec b/config/tizen/packaging/iotjs.spec
index ec7c728b05b125186071ae0d48827c60cfcf6e1d..a907e92b9ea79b5fe7deda9704505b2099e50f44 100644 (file)
--- a/config/tizen/packaging/iotjs.spec
+++ b/config/tizen/packaging/iotjs.spec
@@ -8,7 +8,7 @@ URL: https://www.iotjs.net/
 Source:     %{name}-%{version}.tar.gz
 Source1:    %{name}.pc.in
 Source1001: %{name}.manifest
-ExclusiveArch: %arm
+ExclusiveArch: %arm %ix86 x86_64
 
 
 BuildRequires: python
@@ -40,7 +40,6 @@ Platform for Internet of Things with JavaScript
 # Initialize the variables
 %{!?build_mode: %define build_mode release}
 %{!?external_build_options: %define external_build_options %{nil}}
-
 %package service
 Summary: Development files for %{name}
 Group: Network & Connectivity/Service
@@ -64,6 +63,7 @@ chmod g-w %_sourcedir/*
 cat LICENSE
 cp %{SOURCE1001} .
 
+
 %build
 V=1 VERBOSE=1 ./tools/build.py \
   --clean \
@@ -71,7 +71,9 @@ V=1 VERBOSE=1 ./tools/build.py \
   --profile=test/profiles/tizen.profile \
   --target-arch=noarch \
   --target-os=tizen \
+%ifarch %{arm}
   --target-board=rpi3 \
+%endif
   --external-lib=capi-system-peripheral-io \
   --external-lib=capi-appfw-app-common \
   --external-lib=dlog \
@@ -83,8 +85,7 @@ V=1 VERBOSE=1 ./tools/build.py \
   --external-include-dir=/usr/include/dlog/ \
   --external-include-dir=/usr/include/appcore-agent/ \
   --external-include-dir=/usr/include/appfw/ \
-  --external-include-dir=/usr/include/glib-2.0/ \
-  --external-include-dir=/usr/lib/glib-2.0/include/ \
+  --compile-flag="%(pkg-config --cflags glib-2.0)" \
   --compile-flag=-D__TIZEN__ \
   --compile-flag=-DENABLE_DEBUG_LOG \
   --jerry-cmake-param=-DENABLE_STATIC_LINK=OFF \

diff --git a/deps/libtuv/cmake/option/option_noarch-tizen.cmake b/deps/libtuv/cmake/option/option_noarch-tizen.cmake
index aa2088b4d4bdd0480450d1332e343da527386bec..19ffdd41a3a00e13c797c1e443f70d81930ea2ec 100644 (file)
--- a/deps/libtuv/cmake/option/option_noarch-tizen.cmake
+++ b/deps/libtuv/cmake/option/option_noarch-tizen.cmake
@@ -24,6 +24,7 @@ if(DEFINED TARGET_BOARD)
           "-mfloat-abi=softfp"
           "-mfpu=neon-vfpv4"
           )
+  elseif(${TARGET_BOARD} STREQUAL "None")
   else()
     message(FATAL_ERROR "TARGET_BOARD=`${TARGET_BOARD}` is unknown to make")
   endif()

diff --git a/packaging/iotjs.spec b/packaging/iotjs.spec
index ec7c728b05b125186071ae0d48827c60cfcf6e1d..a907e92b9ea79b5fe7deda9704505b2099e50f44 100644 (file)
--- a/packaging/iotjs.spec
+++ b/packaging/iotjs.spec
@@ -8,7 +8,7 @@ URL: https://www.iotjs.net/
 Source:     %{name}-%{version}.tar.gz
 Source1:    %{name}.pc.in
 Source1001: %{name}.manifest
-ExclusiveArch: %arm
+ExclusiveArch: %arm %ix86 x86_64
 
 
 BuildRequires: python
@@ -40,7 +40,6 @@ Platform for Internet of Things with JavaScript
 # Initialize the variables
 %{!?build_mode: %define build_mode release}
 %{!?external_build_options: %define external_build_options %{nil}}
-
 %package service
 Summary: Development files for %{name}
 Group: Network & Connectivity/Service
@@ -64,6 +63,7 @@ chmod g-w %_sourcedir/*
 cat LICENSE
 cp %{SOURCE1001} .
 
+
 %build
 V=1 VERBOSE=1 ./tools/build.py \
   --clean \
@@ -71,7 +71,9 @@ V=1 VERBOSE=1 ./tools/build.py \
   --profile=test/profiles/tizen.profile \
   --target-arch=noarch \
   --target-os=tizen \
+%ifarch %{arm}
   --target-board=rpi3 \
+%endif
   --external-lib=capi-system-peripheral-io \
   --external-lib=capi-appfw-app-common \
   --external-lib=dlog \
@@ -83,8 +85,7 @@ V=1 VERBOSE=1 ./tools/build.py \
   --external-include-dir=/usr/include/dlog/ \
   --external-include-dir=/usr/include/appcore-agent/ \
   --external-include-dir=/usr/include/appfw/ \
-  --external-include-dir=/usr/include/glib-2.0/ \
-  --external-include-dir=/usr/lib/glib-2.0/include/ \
+  --compile-flag="%(pkg-config --cflags glib-2.0)" \
   --compile-flag=-D__TIZEN__ \
   --compile-flag=-DENABLE_DEBUG_LOG \
   --jerry-cmake-param=-DENABLE_STATIC_LINK=OFF \