From: Victor Hakoun <victor.hakoun@eurogiciel.fr>
Date: Tue, 18 Jun 2013 09:03:09 +0000 (+0200)
Subject: Fix build x86_64, remove build option -fpie
X-Git-Tag: submit/tizen/20130628.095932~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b28c864558032c1c9efef1ec4a259724b13fc5f;p=apps%2Fcore%2Fpreloaded%2Fsettings.git

Fix build x86_64, remove build option -fpie

Change-Id: I6772ef7273c702a1d57db32234943ea88a9e2f5f
---

diff --git a/packaging/org.tizen.setting.spec b/packaging/org.tizen.setting.spec
index 22833df..2cbb291 100755
--- a/packaging/org.tizen.setting.spec
+++ b/packaging/org.tizen.setting.spec
@@ -89,14 +89,12 @@ Setting application
 %define PREFIX    "/usr/apps/org.tizen.setting"
 %define RESDIR    "/usr/apps/org.tizen.setting/res"
 %define DATADIR    "/usr/apps/org.tizen.setting/data"
-CFLAGS+=" -fPIC";export CFLAGS
-CXXFLAGS+=" -fPIC";export CFLAGS
 LDFLAGS+="-Wl,--rpath=%{PREFIX}/lib -Wl,--hash-style=both -Wl,--as-needed";export LDFLAGS
 
 %ifarch %{arm}
-	cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=arm
+	%cmake . -DARCH=arm
 %else
-	cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} -DARCH=x86
+	%cmake . -DARCH=x86
 %endif
 
 make
diff --git a/setting-about/CMakeLists.txt b/setting-about/CMakeLists.txt
index e8cc88d..42fd650 100755
--- a/setting-about/CMakeLists.txt
+++ b/setting-about/CMakeLists.txt
@@ -24,7 +24,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-common/CMakeLists.txt b/setting-common/CMakeLists.txt
index 2012fea..05b930c 100755
--- a/setting-common/CMakeLists.txt
+++ b/setting-common/CMakeLists.txt
@@ -23,7 +23,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl, --rpath=/usr/lib")
 
diff --git a/setting-display/CMakeLists.txt b/setting-display/CMakeLists.txt
index 4477be3..9b05cb0 100755
--- a/setting-display/CMakeLists.txt
+++ b/setting-display/CMakeLists.txt
@@ -18,7 +18,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-fileview/CMakeLists.txt b/setting-fileview/CMakeLists.txt
index c12ac0b..80063c3 100755
--- a/setting-fileview/CMakeLists.txt
+++ b/setting-fileview/CMakeLists.txt
@@ -22,7 +22,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-font/CMakeLists.txt b/setting-font/CMakeLists.txt
index 9be6fee..1962ab0 100755
--- a/setting-font/CMakeLists.txt
+++ b/setting-font/CMakeLists.txt
@@ -20,7 +20,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-memory/CMakeLists.txt b/setting-memory/CMakeLists.txt
index e700569..ca32e35 100755
--- a/setting-memory/CMakeLists.txt
+++ b/setting-memory/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-menuscreen/CMakeLists.txt b/setting-menuscreen/CMakeLists.txt
index 84c022d..174947c 100755
--- a/setting-menuscreen/CMakeLists.txt
+++ b/setting-menuscreen/CMakeLists.txt
@@ -18,7 +18,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-network/CMakeLists.txt b/setting-network/CMakeLists.txt
index e614715..1c7120c 100755
--- a/setting-network/CMakeLists.txt
+++ b/setting-network/CMakeLists.txt
@@ -20,7 +20,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-password/CMakeLists.txt b/setting-password/CMakeLists.txt
index 84ce41a..880c2a3 100755
--- a/setting-password/CMakeLists.txt
+++ b/setting-password/CMakeLists.txt
@@ -21,7 +21,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl, --rpath=/usr/lib")
 
diff --git a/setting-phone/CMakeLists.txt b/setting-phone/CMakeLists.txt
index ff03b90..55886a5 100755
--- a/setting-phone/CMakeLists.txt
+++ b/setting-phone/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 #SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-powersaving/CMakeLists.txt b/setting-powersaving/CMakeLists.txt
index e72f5be..472c601 100755
--- a/setting-powersaving/CMakeLists.txt
+++ b/setting-powersaving/CMakeLists.txt
@@ -21,7 +21,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl, --rpath=/usr/lib")
 
diff --git a/setting-profile/CMakeLists.txt b/setting-profile/CMakeLists.txt
index 8925a0b..adb631b 100755
--- a/setting-profile/CMakeLists.txt
+++ b/setting-profile/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-reset/CMakeLists.txt b/setting-reset/CMakeLists.txt
index 25cb1b4..e0a4d5d 100644
--- a/setting-reset/CMakeLists.txt
+++ b/setting-reset/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-security/CMakeLists.txt b/setting-security/CMakeLists.txt
index d82cc97..dc5e96f 100755
--- a/setting-security/CMakeLists.txt
+++ b/setting-security/CMakeLists.txt
@@ -20,7 +20,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-storage/CMakeLists.txt b/setting-storage/CMakeLists.txt
index ebe2ecd..2b3c80d 100755
--- a/setting-storage/CMakeLists.txt
+++ b/setting-storage/CMakeLists.txt
@@ -20,7 +20,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-time/CMakeLists.txt b/setting-time/CMakeLists.txt
index ffd08d3..30e57b6 100755
--- a/setting-time/CMakeLists.txt
+++ b/setting-time/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/setting-viewtype/CMakeLists.txt b/setting-viewtype/CMakeLists.txt
index 719d3c1..56bc883 100755
--- a/setting-viewtype/CMakeLists.txt
+++ b/setting-viewtype/CMakeLists.txt
@@ -19,7 +19,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
-ADD_DEFINITIONS("-fpie")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 21d36d2..8039a3e 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,7 +44,6 @@ ADD_DEFINITIONS("-DICONDIR=\"${ICONDIR}\"")
 ADD_DEFINITIONS("-DEDJEDIR=\"${EDJEDIR}\"")
 ADD_DEFINITIONS("-DSLP_DEBUG")
 
-ADD_DEFINITIONS("-fpie")
 
 ADD_DEFINITIONS("-DXP_UNIX")
 
@@ -67,7 +66,7 @@ ADD_EXECUTABLE(${SETTING_CONFUTIL}
 	./conf_util/setting_confutil.c
 	)
 TARGET_LINK_LIBRARIES(${SETTING_CONFUTIL} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
-TARGET_LINK_LIBRARIES(${SETTING_CONFUTIL} ${pkgs_main_LDFLAGS} "-pie")
+TARGET_LINK_LIBRARIES(${SETTING_CONFUTIL} ${pkgs_main_LDFLAGS})
 INSTALL(TARGETS ${SETTING_CONFUTIL} DESTINATION /usr/apps/${SETTING_PKG_NAME}/bin)
 
 ####FOR TEST>>>>########
@@ -77,7 +76,7 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -l
 
 # dmalloc
 #TARGET_LINK_LIBRARIES(${PROJECT_NAME} -ldmalloc)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_main_LDFLAGS} "-pie")
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_main_LDFLAGS})
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/apps/${SETTING_PKG_NAME}/bin)