Support i586 unified build

Change-Id: I780058cfa171e436b773a90df26a2771890cb882
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/bt-service-emul/CMakeLists.txt b/bt-service-emul/CMakeLists.txt
index ccb9eeedbb7b1e7751f400a62160583f9b870d8e..0bb05306b970169ee2f6a0808e72ef50b35a8f68 100644 (file)
--- a/bt-service-emul/CMakeLists.txt
+++ b/bt-service-emul/CMakeLists.txt
@@ -83,7 +83,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service DESTINATION share/dbus-1/system-services)
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin/bt-service)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/auto-pair-blacklist DESTINATION /opt/var/lib/bluetooth/)
 

diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index ecdee28a198d8b42ac64b06493acc2d48563b0d6..f90879d1701ca96059df88add962ab4076856437 100644 (file)
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -179,14 +179,20 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 
 %ifarch x86_64
 export CFLAGS="$CFLAGS -Wall -g -fvisibility=hidden -fPIC"
-export CFLAGS+=" -DARCH64 -DTIZEN_TEST_EMUL"
-export CXXFLAGS+=" -DARCH64 -DTIZEN_TEST_EMUL"
-export FFLAGS+=" -DARCH64 -DTIZEN_TEST_EMUL"
+export CFLAGS+=" -DARCH64"
+export CXXFLAGS+=" -DARCH64"
+export FFLAGS+=" -DARCH64"
 %else
 export CFLAGS="$CFLAGS -fpie"
 export LDFLAGS="$CFLAGS -pie"
 %endif
 
+%ifarch %{ix86} x86_64
+export CFLAGS+=" -DTIZEN_TEST_EMUL"
+export CXXFLAGS+=" -DTIZEN_TEST_EMUL"
+export FFLAGS+=" -DTIZEN_TEST_EMUL"
+%endif
+
 export CFLAGS="$CFLAGS -DTIZEN_FEATURE_BT_RFCOMM_DIRECT"
 export LDFLAGS="$CFLAGS -Wl,--rpath=%{_libdir} -Wl,--as-needed -Wl,--unresolved-symbols=ignore-in-shared-libs"
 
@@ -273,6 +279,7 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 # extension-emulator
 %ifarch %{ix86} x86_64
 cp build_emulator/libbluetooth-api.so*.emulator %{buildroot}%{_libdir}/
+mv %{buildroot}/%{_bindir}/bt-service-emul %{buildroot}/%{_bindir}/bt-service
 %endif
 
 # Rename the postfix (.mobile, .tv, ..) at post script