From cd30819fc39d83f50afac24d87839002360e33fb Mon Sep 17 00:00:00 2001 From: Youngjae Shin Date: Wed, 22 Jul 2015 15:06:44 +0900 Subject: [PATCH] remove PIE option on global configuation Change-Id: Ib6e89f4085c9d9f285596260c5be9f583896ee77 --- CMakeLists.txt | 5 ++--- daemon/CMakeLists.txt | 3 +++ lib/CMakeLists.txt | 10 +--------- packaging/iotcon.spec | 19 +++++++++++++++++++ 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34514c7..6d58b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,11 +3,10 @@ PROJECT(iotcon) INCLUDE(FindPkgConfig) -SET(EXTRA_CFLAGS "-Wall -Werror-implicit-function-declaration -fvisibility=hidden -fPIE") +SET(EXTRA_CFLAGS "-Wall -Werror-implicit-function-declaration -fvisibility=hidden") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fvisibility=hidden -fPIE") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--hash-style=both -pie") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fvisibility=hidden") SET(CLIENT ${PROJECT_NAME}) SET(DAEMON "${PROJECT_NAME}-daemon") diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt index ca88200..45af5bd 100644 --- a/daemon/CMakeLists.txt +++ b/daemon/CMakeLists.txt @@ -11,6 +11,9 @@ pkg_check_modules(daemon_pkgs REQUIRED gio-2.0 dlog gio-unix-2.0 json-glib-1.0) INCLUDE_DIRECTORIES(${daemon_pkgs_INCLUDE_DIRS}) LINK_DIRECTORIES(${daemon_pkgs_LIBRARY_DIRS}) +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--hash-style=both -pie") ADD_DEFINITIONS("-DIOTCON_DBUS_INTERFACE=\"${DBUS_INTERFACE}\"") ADD_EXECUTABLE(${DAEMON} ${DAEMON_SRCS}) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2e01d47..3831ec6 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -16,15 +16,7 @@ ADD_DEFINITIONS("-DIOTCON_DBUS_INTERFACE=\"${DBUS_INTERFACE}\"") ADD_LIBRARY(${CLIENT} SHARED ${CLIENT_SRCS}) ADD_DEPENDENCIES(${CLIENT} GENERATED_DBUS_CODE) -TARGET_LINK_LIBRARIES(${CLIENT} - ${client_pkgs_LIBRARIES} - ${OCLIB} - ${OCLOGGER} - ${OCLOGGER_CORE} - ${CA} - ${OCTBSTACK} - pthread -) +TARGET_LINK_LIBRARIES(${CLIENT} ${client_pkgs_LIBRARIES}) SET_TARGET_PROPERTIES(${CLIENT} PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER}) INSTALL(TARGETS ${CLIENT} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/packaging/iotcon.spec b/packaging/iotcon.spec index 5504f64..a16b6d6 100644 --- a/packaging/iotcon.spec +++ b/packaging/iotcon.spec @@ -15,6 +15,10 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(capi-base-common) +%if "%{tizen}" == "2.3" +BuildRequires: python-xml +%endif + %define _unitdir /usr/lib/systemd/system %description @@ -67,6 +71,13 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants cp -af %{SOURCE1} %{buildroot}%{_unitdir}/ ln -s ../%{name}.service %{buildroot}%{_unitdir}/multi-user.target.wants/%{name}.service +%if 0%{?tizen_version_major} < 3 +mkdir -p %{buildroot}/%{_datadir}/license +cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name} +cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-lib +%endif + + %post systemctl daemon-reload if [ $1 == 1 ]; then @@ -92,13 +103,21 @@ systemctl daemon-reload %{_unitdir}/multi-user.target.wants/%{name}.service %{_bindir}/%{name}-daemon %{_datadir}/dbus-1/services/org.tizen.%{name}.dbus.service +%if 0%{?tizen_version_major} < 3 +%{_datadir}/license/%{name} +%else %license LICENSE.APLv2 +%endif %files lib %manifest lib%{name}.manifest %defattr(-,root,root,-) %{_libdir}/lib%{name}.so.* +%if 0%{?tizen_version_major} < 3 +%{_datadir}/license/%{name}-lib +%else %license LICENSE.APLv2 +%endif %files devel %defattr(-,root,root,-) -- 2.7.4