Fix build x86_64

- Remove build option -fpie to avoid this error :
relocation R_X86_64_PC32 against symbol `dlist_next' can not be used when making a shared object; recompile with -fPIC

- Remove unused variable (svc_ctx)

- Fix rpmlint error summary end with dot

- Use %{_unitdir_user} unstead of %{_libdir}/systemd/user

- g_type_init() is deprecated is GLib version 3.36 or above => add test directive to check glib version to avoid warning :
util_liveinfo/src/liveinfo.c:1722:2: error: 'g_type_init' is deprecated (declared at /usr/include/glib-2.0/gobject/gtype.h:669) [-Werror=deprecated-declarations]

Change-Id: I2f111f965864b1f18d2bb8bddc791af71d0beba7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a907636..0c17570 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,8 @@ pkg_check_modules(pkg REQUIRED
 )
 
 SET(PACKAGE "${PROJECT_NAME}")
-SET(CMAKE_C_FLAGS "-Wall -fpie -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g")
-SET(CMAKE_EXE_LINKER_FLAGS "-pie")
+SET(CMAKE_C_FLAGS "-Wall -Winline -Werror -fno-builtin-malloc -fno-omit-frame-pointer -g")
+SET(CMAKE_EXE_LINKER_FLAGS)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
 

diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec
index c1d54a9..c4eeb0e 100644 (file)
--- a/packaging/data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@ -1,5 +1,5 @@
 Name: data-provider-master
-Summary: Master service provider for liveboxes.
+Summary: Master service provider for liveboxes
 Version: 0.23.2
 Release: 1
 Group: HomeTF/Livebox
@@ -43,9 +43,7 @@ Keep trace on the life-cycle of the livebox and status of the service providers,
 %setup -q
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPRODUCT=private
-
-CFLAGS="${CFLAGS} -Wall -Winline -Werror" LDFLAGS="${LDFLAGS}" make %{?jobs:-j%jobs}
+%cmake . -DPRODUCT=private
 
 %install
 rm -rf %{buildroot}
@@ -57,11 +55,11 @@ mkdir -p %{buildroot}/opt/usr/share/live_magazine/reader
 mkdir -p %{buildroot}/opt/usr/share/live_magazine/always
 mkdir -p %{buildroot}/opt/dbspace
 mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants
+mkdir -p %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants
 touch %{buildroot}/opt/dbspace/.livebox.db
 touch %{buildroot}/opt/dbspace/.livebox.db-journal
 ln -sf %{_sysconfdir}/rc.d/init.d/data-provider-master %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
-ln -sf %{_libdir}/systemd/user/data-provider-master.service %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
+ln -sf %{_unitdir_user}/data-provider-master.service %{buildroot}%{_unitdir_user}/tizen-middleware.target.wants/data-provider-master.service
 
 %pre
 # Executing the stop script for stopping the service of installed provider (old version)
@@ -95,8 +93,8 @@ echo "%{_sysconfdir}/init.d/data-provider-master start"
 %{_bindir}/liveinfo
 %{_prefix}/etc/package-manager/parserlib/*
 %{_datarootdir}/data-provider-master/*
-%{_libdir}/systemd/user/data-provider-master.service
-%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
+%{_unitdir_user}/data-provider-master.service
+%{_unitdir_user}/tizen-middleware.target.wants/data-provider-master.service
 %{_datarootdir}/license/*
 /opt/usr/share/live_magazine
 /opt/usr/share/live_magazine/log

diff --git a/src/event.c b/src/event.c
index 39ff21d..c7392a2 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -198,7 +198,7 @@ static inline int processing_input_event(struct input_event *event)
 static void *event_thread_main(void *data)
 {
        fd_set set;
-       int ret = 0;
+       long ret = 0;
        struct input_event input_event;
        char *ptr = (char *)&input_event;
        int offset = 0;
@@ -270,7 +270,7 @@ static inline int reclaim_tcb_resources(void)
        if (status != 0)
                ErrPrint("Failed to join a thread: %s\n", strerror(errno));
        else
-               DbgPrint("Thread returns: %d\n", (int)ret);
+               DbgPrint("Thread returns: %p\n", ret);
 
        ecore_main_fd_handler_del(s_info.event_handler);
        s_info.event_handler = NULL;

diff --git a/src/main.c b/src/main.c
index e57fc6b..f28a334 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -232,7 +232,9 @@ int main(int argc, char *argv[])
                return -EFAULT;
        }
 
+#if !GLIB_CHECK_VERSION (2, 36, 0)
        g_type_init();
+#endif
 
        conf_loader();
 

diff --git a/src/parser.c b/src/parser.c
index 948aec8..b3ce154 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -33,6 +33,12 @@
 static Eina_List *s_list;
 int errno;
 
+#if __x86_64__
+#define RETURN_TYPE long long
+#else
+#define RETURN_TYPE int
+#endif
+
 struct parser {
        char *filename;
        double period;
@@ -157,7 +163,7 @@ HAPI int parser_buffer_pd(struct parser *handle)
        return handle->buffer_pd;
 }
 
-HAPI int parser_find(const char *pkgname)
+HAPI RETURN_TYPE parser_find(const char *pkgname)
 {
        Eina_List *l;
        struct parser *item;
@@ -182,7 +188,7 @@ HAPI int parser_find(const char *pkgname)
        EINA_LIST_FOREACH(s_list, l, item) {
                if (!strcmp(item->filename, filename)) {
                        DbgFree(filename);
-                       return (int)item;
+                       return (RETURN_TYPE)item;
                }
        }
 

diff --git a/src/service_common.c b/src/service_common.c
index 0190bf6..f52b842 100644 (file)
--- a/src/service_common.c
+++ b/src/service_common.c
@@ -108,7 +108,7 @@ static void *client_packet_pump_main(void *data)
        int packet_offset;
        int recv_offset;
        int pid;
-       int ret;
+       long ret;
        char evt_ch = EVT_CH;
        enum {
                RECV_INIT,
@@ -365,7 +365,7 @@ static inline void tcb_teminate_all(struct service_context *svc_ctx)
                if (status != 0)
                        ErrPrint("Unable to join a thread: %s\n", strerror(status));
                else
-                       DbgPrint("Thread returns: %d\n", (int)ret);
+                       DbgPrint("Thread returns: %p\n", ret);
 
                free(tcb);
        }
@@ -391,7 +391,7 @@ static inline void tcb_destroy(struct service_context *svc_ctx, struct tcb *tcb)
        if (status != 0)
                ErrPrint("Unable to join a thread: %s\n", strerror(status));
        else
-               DbgPrint("Thread returns: %d\n", (int)ret);
+               DbgPrint("Thread returns: %p\n", ret);
 
        free(tcb);
 }
@@ -489,7 +489,7 @@ static void *server_main(void *data)
 {
        struct service_context *svc_ctx = data;
        fd_set set;
-       int ret;
+       long ret;
        int client_fd;
        struct tcb *tcb;
        int fd;
@@ -712,7 +712,7 @@ HAPI int service_common_destroy(struct service_context *svc_ctx)
        if (status != 0)
                ErrPrint("Join: %s\n", strerror(status));
        else
-               DbgPrint("Thread returns: %d\n", (int)ret);
+               DbgPrint("Thread returns: %p\n", ret);
 
        status = pthread_mutex_destroy(&svc_ctx->packet_list_lock);
        if (status != 0)
@@ -780,12 +780,9 @@ HAPI struct service_context *tcb_svc_ctx(struct tcb *tcb)
  */
 HAPI int service_common_unicast_packet(struct tcb *tcb, struct packet *packet)
 {
-       struct service_context *svc_ctx;
        if (!tcb || !packet)
                return -EINVAL;
 
-       svc_ctx = tcb->svc_ctx;
-
        DbgPrint("Unicast packet\n");
        return secure_socket_send(tcb->fd, (void *)packet_data(packet), packet_size(packet));
 }

diff --git a/util_liveinfo/src/liveinfo.c b/util_liveinfo/src/liveinfo.c
index a44a9f7..0352d9b 100644 (file)
--- a/util_liveinfo/src/liveinfo.c
+++ b/util_liveinfo/src/liveinfo.c
@@ -1719,7 +1719,10 @@ int main(int argc, char *argv[])
        } while (c != -1);
 
        ecore_init();
-       g_type_init();
+
+#if !GLIB_CHECK_VERSION (2, 36, 0)
+               g_type_init();
+#endif
 
        com_core_add_event_callback(CONNECTOR_DISCONNECTED, disconnected_cb, NULL);
        com_core_add_event_callback(CONNECTOR_CONNECTED, connected_cb, NULL);