Apply RELRO commonly

Change-Id: I59bf3b7d41c80b0da165bd4c9568fd4eeb8e3038

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65dbf0b..9c1396a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,6 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 ADD_DEFINITIONS(-DTZ_SYS_DATA_PATH="${TZ_SYS_DATA}")
 
-SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-
 aux_source_directory(core/src SOURCES)
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
 

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 042bd83..653dad1 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.36
+Version:    0.3.38
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -73,14 +73,9 @@ export CFLAGS+=" -DMUSE_USE_CLIENT_SIGHANDLER"
 export CFLAGS+=" -DMUSE_REGISTER_VIP -DMUSE_USE_LWIPC -DMUSE_TTRACE_LOG"
 %cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_REGISTER_VIP=1 -DMUSE_TTRACE_LOG=1 -DMUSE_USE_LWIPC=1
 %else
-%if ("%{tizen_profile_name}" == "wearable")
-export CFLAGS+=" -DMUSE_USE_POWER_OFF_STATE_CHANGE -DMUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE -DMUSE_USE_WATCHDOG"
-%cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA -DMUSE_RELRO_ENABLE=1
-%else
 export CFLAGS+=" -DMUSE_USE_POWER_OFF_STATE_CHANGE -DMUSE_USE_EXTERNAL_STORAGE_STATE_CHANGE -DMUSE_USE_WATCHDOG"
 %cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIBDIR=%{_libdir} -DTZ_SYS_DATA=%TZ_SYS_DATA
 %endif
-%endif
 
 make %{?jobs:-j%jobs}
 

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index e53927e..ed08110 100644 (file)
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -38,11 +38,7 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DTIZEN_DEBUG")
 
 
-IF(${MUSE_RELRO_ENABLE})
-    SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,--as-needed -pie")
-ELSE()
-    SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
-ENDIF(${MUSE_RELRO_ENABLE})
+SET(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,--as-needed -pie")
 
 aux_source_directory(src SER_SOURCES)
 ADD_LIBRARY(${fw_name}-${server} SHARED ${SER_SOURCES})