Fix for TIVI 2222 : Add build option to enable SMACK related features

Change-Id: I2069e76a88892ada0ce401451600566028014ca8
Signed-off-by: Baptiste DURAND <baptiste.durand@eurogiciel.fr>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c970c45d29a5cc0ca924ed0d7a86e89726e5679e..692e069df448fb4024f4652db5b4e54e631c6ad1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,10 @@ ADD_DEFINITIONS("-Wextra")                      # Generate even more extra warni
 
 STRING(REGEX MATCH "([^.]*)" API_VERSION "${VERSION}")
 ADD_DEFINITIONS("-DAPI_VERSION=\"$(API_VERSION)\"")
-ADD_DEFINITIONS( -DSMACK_ENABLED )
+OPTION(SMACK "Enable smack support" ON)
+IF(SMACK)
+       ADD_DEFINITIONS( -DSMACK_ENABLED )
+ENDIF(SMACK)
 
 SET(TARGET_SECURITY_SERVER "security-server")
 SET(TARGET_SECURITY_CLIENT "security-server-client")

diff --git a/packaging/security-server.spec b/packaging/security-server.spec
index 72b17424df1ccc350138c11a1deae98bcf8feebd..3ef67690234eb0725dedef3b9be827c4b8a466f1 100644 (file)
--- a/packaging/security-server.spec
+++ b/packaging/security-server.spec
@@ -64,7 +64,8 @@ cp %{SOURCE1001} .
 export LDFLAGS+="-Wl,--rpath=%{_libdir}"
 
 %cmake . -DVERSION=%{version} \
-        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}
+        -DCMAKE_BUILD_TYPE=%{?build_type:%build_type} \
+        -DSMACK=Off
 make %{?jobs:-j%jobs}