Adjust build options

- Remove unused build parameters

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49b2b14cbec700907c09791163440af4ac5e420a..a5d32a9e589865c8d0791e9e28d151cccbe2542e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,19 +26,12 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -Wextra -Wall -Wdecl
 
 ##Address-Space Layout Randomization
 MESSAGE(" - Address-Space Layout Randomizations")
-SET(CMAKE_C_FLAGS_DEBUG "O0 -g -fPIE")
-SET(CMAKE_C_FLAGS_RELEASE "O2 -fPIE")
-
-MESSAGE(" - Set architecture type : " ${ARCHITECTURE})
-SET(ARCH "${ARCHITECTURE}")
+SET(CMAKE_C_FLAGS_DEBUG "-fPIE")
+SET(CMAKE_C_FLAGS_RELEASE "-fPIE")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DUSE_DLOG")
-
-IF(TIZEN_ARCH_64)
-       ADD_DEFINITIONS(-DTIZEN_ARCH_64)
-ENDIF(TIZEN_ARCH_64)
-
+ADD_DEFINITIONS("-DTIZEN_DEBUG_ENABLE")
 IF(TIZEN_FEATURE_MESH_ON_DEMAND)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_MESH_ON_DEMAND)
 ENDIF(TIZEN_FEATURE_MESH_ON_DEMAND)
@@ -70,7 +63,6 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/mesh-generated-code.c PROPERTIES
 
 INCLUDE_DIRECTORIES(${daemon_pkgs_INCLUDE_DIRS})
 LINK_DIRECTORIES(${daemon_pkgs_LIBRARY_DIRS})
-MESSAGE("KSR " ${daemon_pkgs_LIBRARY_DIRS})
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--hash-style=both -pie")

diff --git a/packaging/meshd.spec b/packaging/meshd.spec
index 251246c9450b31eacac73f3da4297425c27a66c0..45fdf7ddc46bb55553035ffb6bd77326621f907f 100644 (file)
--- a/packaging/meshd.spec
+++ b/packaging/meshd.spec
@@ -35,28 +35,11 @@ cp -a %{SOURCE2} .
 cp -a %{SOURCE3} .
 
 %build
+CFLAGS=$(echo $CFLAGS | sed 's/-O2/-O0/' | sed 's/-O1/-O0/' | sed 's/-Wp,-D_FORTIFY_SOURCE=2//')
+CXXFLAGS=$(echo $CXXFLAGS | sed 's/-O2/-O0/' | sed 's/-O1/-O0/' | sed 's/-Wp,-D_FORTIFY_SOURCE=2//')
 
-export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
-export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
-export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
-
-%ifarch %{arm}
-export ARCH=arm
-%else
-
-%if 0%{?simulator}
-export ARCH=emul
-%else
-export ARCH=i586
-%endif
-
-%endif
-
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DTIZEN_FEATURE_MESH_ON_DEMAND=1 \
-%if "%{?_lib}" == "lib64"
-       -DTIZEN_ARCH_64=1 \
-%endif
        -DLIB_DIR=%{_libdir} \
        -DBIN_DIR=%{_bindir} \
        -DSBIN_DIR=%{_sbindir}
@@ -72,12 +55,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 cp meshd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/meshd.conf
 mkdir -p %{buildroot}%{_datadir}/dbus-1/system-services/
 cp net.mesh.service %{buildroot}%{_datadir}/dbus-1/system-services/net.mesh.service
-mkdir -p %{buildroot}%{_libdir}/systemd/system/
-cp meshd.service %{buildroot}%{_libdir}/systemd/system/meshd.service
-%if "%{?_lib}" == "lib64"
 mkdir -p %{buildroot}%{_unitdir}
 cp meshd.service %{buildroot}%{_unitdir}/meshd.service
-%endif
 
 %post
 chmod 755 %{_sbindir}/mesh.sh
@@ -92,8 +71,5 @@ mkdir -p %TZ_SYS_VAR/lib/mesh
 %caps(cap_net_raw,cap_net_admin=eip) %attr(750,system,system) %{_bindir}/meshd
 %config %{_sysconfdir}/dbus-1/system.d/meshd.conf
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
-%attr(644,root,root) %{_libdir}/systemd/system/*
-%if "%{?_lib}" == "lib64"
-%{_unitdir}/meshd.service
-%endif
+%attr(644,root,root) %{_unitdir}/meshd.service
 %attr(750,root,root) %{_sbindir}/mesh.sh