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 22833df7081070771b47c4635da9eea0a4749177..2cbb291107fc4caba80ed166ac3a6d8485cf1b22 100755 (executable)
--- 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 e8cc88db5e3a3ac212afcda0e8c1720dedcf3d38..42fd6504783b5302a739d0dedd0c3f51885a9896 100755 (executable)
--- 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 2012fea776e4d7ae6b54f2a106f18513dac0241e..05b930cac33b2c6f68cc3bc476b5282482352d29 100755 (executable)
--- 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 4477be393de97393ecf14e0824475429301889cf..9b05cb06bd191a94e96afe149b05e1ede29f2359 100755 (executable)
--- 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 c12ac0b335faca8d61d1bf1326c4df14014b1f7a..80063c3cc301af9954d1b864eb3de13b9abafbde 100755 (executable)
--- 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 9be6feeb4442fa675c5eed373568bc2179a226c0..1962ab0edc8666865c6fca9286c74c1d2a354c26 100755 (executable)
--- 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 e7005692de3443efb5984668e2e76b0397edb842..ca32e351f761f9ee209a57e1566fc597fd05966b 100755 (executable)
--- 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 84c022d648726c0172d0bcdb9cd054f44a185e44..174947cabe72426e42008a924f16eda7a8377355 100755 (executable)
--- 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 e614715d12d6e189dfa1a8f06c85802284c542fa..1c7120c83d7ecec518289239401f1708fdd2e4ce 100755 (executable)
--- 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 84ce41a6d450f0870324369e82e47fc9cc45788a..880c2a31b66d902952afe2f4d44a7de8100b2b6c 100755 (executable)
--- 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 ff03b90a27f6221e6cade8b7322a9f92a251419d..55886a5b738ac083913ccacae226002b24abddaa 100755 (executable)
--- 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 e72f5be79ec9268388de37c64a383f29a27f8a9d..472c6018d65f27140536835518363f58a635e5be 100755 (executable)
--- 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 8925a0befed94d6c782a05e456394333eeb8051b..adb631b5ee3f82a81db4ac7f745532e988ea01b8 100755 (executable)
--- 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 25cb1b425450a6e16ffb9487fc421c638c6ea413..e0a4d5d75d5d281bc68e01c09e573f8587a67f70 100644 (file)
--- 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 d82cc97b3f89366d7cb44a007ee0e6d82609d0ae..dc5e96f7fd1f0c86517cae08912f6c5ca12947ba 100755 (executable)
--- 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 ebe2ecd9b813b0a7b59a450e0fea4e2e77d18421..2b3c80d933e55da07ed801c6dcfadd54a7e00da6 100755 (executable)
--- 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 ffd08d306054337f48a4e916e1acdb0bd1c0a1fd..30e57b6c95419a65a676d1e69eb723886e09e7a7 100755 (executable)
--- 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 719d3c11d5af447421479ce195ad03420a2092c7..56bc883fe771bc1751becf54538ca2af340369d9 100755 (executable)
--- 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 21d36d204e0cf83e7969b7a3d10b502df2203143..8039a3e5495a6c9c5f42a47db34c137df1b229a2 100755 (executable)
--- 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)