From 72544dac715065d25470b5292442d0d7afef5d41 Mon Sep 17 00:00:00 2001
From: Zbigniew Kostrzewa <z.kostrzewa@samsung.com>
Date: Fri, 8 Feb 2013 10:49:20 +0100
Subject: [PATCH] Support for GCC 4.7

Compatibility with GCC v 4.7 is required.

This commit fix problems with compilation with GCC 4.7.

[Issue#] N/A
[Bug] The repository causes build break with GCC 4.7
[Cause] N/A
[Solution] Source code adjusted to GCC 4.7

[Verification]
1. Build repository with GCC in current (4.5) and 4.7 version.

Change-Id: I8a0839e7a9d78b86c16f8feccecac3e3fbfd3ea0
---
 src/jobs/widget_install/task_database.cpp          | 1 +
 src/jobs/widget_install/task_file_manipulation.cpp | 1 +
 src/jobs/widget_install/task_manifest_file.cpp     | 1 +
 src/jobs/widget_install/task_plugins_copy.cpp      | 1 +
 src/jobs/widget_install/task_update_files.cpp      | 1 +
 src/jobs/widget_uninstall/task_remove_files.cpp    | 1 +
 src/pkg-manager/CMakeLists.txt                     | 2 +-
 src/wrt-installer/CMakeLists.txt                   | 2 +-
 src/wrt-installer/plugin_utils.cpp                 | 1 +
 9 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/jobs/widget_install/task_database.cpp b/src/jobs/widget_install/task_database.cpp
index d5ba2b9..cc931a0 100644
--- a/src/jobs/widget_install/task_database.cpp
+++ b/src/jobs/widget_install/task_database.cpp
@@ -21,6 +21,7 @@
  * @brief   Implementation file for installer task database updating for widget
  * update
  */
+#include <unistd.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <widget_install/task_database.h>
diff --git a/src/jobs/widget_install/task_file_manipulation.cpp b/src/jobs/widget_install/task_file_manipulation.cpp
index 65ccc0f..fddd770 100644
--- a/src/jobs/widget_install/task_file_manipulation.cpp
+++ b/src/jobs/widget_install/task_file_manipulation.cpp
@@ -19,6 +19,7 @@
  * @version 1.0
  * @brief   Implementation file for installer task database updating
  */
+#include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <widget_install/task_file_manipulation.h>
diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp
index 92b372c..7187b52 100644
--- a/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@ -21,6 +21,7 @@
  */
 
 //SYSTEM INCLUDES
+#include <unistd.h>
 #include <string>
 #include <dpl/assert.h>
 #include <dirent.h>
diff --git a/src/jobs/widget_install/task_plugins_copy.cpp b/src/jobs/widget_install/task_plugins_copy.cpp
index 0e72ced..c91f7c2 100644
--- a/src/jobs/widget_install/task_plugins_copy.cpp
+++ b/src/jobs/widget_install/task_plugins_copy.cpp
@@ -20,6 +20,7 @@
  * @brief   Copying plugins delivered in widget package.
  */
 
+#include <unistd.h>
 #include "task_plugins_copy.h"
 #include <dpl/log/log.h>
 #include <dpl/string.h>
diff --git a/src/jobs/widget_install/task_update_files.cpp b/src/jobs/widget_install/task_update_files.cpp
index c9afcca..bcbd2f3 100644
--- a/src/jobs/widget_install/task_update_files.cpp
+++ b/src/jobs/widget_install/task_update_files.cpp
@@ -20,6 +20,7 @@
  * @brief   Implementation file for installer task update files
  */
 
+#include <unistd.h>
 #include <utility>
 #include <vector>
 #include <string>
diff --git a/src/jobs/widget_uninstall/task_remove_files.cpp b/src/jobs/widget_uninstall/task_remove_files.cpp
index 5dd82c4..5f66122 100644
--- a/src/jobs/widget_uninstall/task_remove_files.cpp
+++ b/src/jobs/widget_uninstall/task_remove_files.cpp
@@ -20,6 +20,7 @@
  * @brief   Implementation file for uninstaller task for removing widget files
  */
 
+#include <unistd.h>
 #include <widget_uninstall/task_remove_files.h>
 #include <widget_uninstall/job_widget_uninstall.h>
 #include <widget_uninstall/uninstaller_context.h>
diff --git a/src/pkg-manager/CMakeLists.txt b/src/pkg-manager/CMakeLists.txt
index ea06b72..eb754ea 100755
--- a/src/pkg-manager/CMakeLists.txt
+++ b/src/pkg-manager/CMakeLists.txt
@@ -41,7 +41,7 @@ TARGET_LINK_LIBRARIES(${TARGET_BACKEND_LIB}
 )
 
 SET_TARGET_PROPERTIES(${TARGET_BACKEND_LIB} PROPERTIES
-    LINK_FLAGS "-Wl,--as-needed -Wl,--hash-style=both -Wl"
+    LINK_FLAGS "-Wl,--as-needed -Wl,--hash-style=both"
 )
 
 INSTALL(TARGETS ${TARGET_BACKEND_LIB}
diff --git a/src/wrt-installer/CMakeLists.txt b/src/wrt-installer/CMakeLists.txt
index 12d2c7c..aef18ba 100644
--- a/src/wrt-installer/CMakeLists.txt
+++ b/src/wrt-installer/CMakeLists.txt
@@ -64,7 +64,7 @@ TARGET_LINK_LIBRARIES(${TARGET_INSTALLER}
 
 
 SET_TARGET_PROPERTIES(${TARGET_INSTALLER} PROPERTIES
-    LINK_FLAGS "-Wl,--as-needed -Wl,--hash-style=both -Wl"
+    LINK_FLAGS "-Wl,--as-needed -Wl,--hash-style=both"
     BUILD_WITH_INSTALL_RPATH ON
     INSTALL_RPATH_USE_LINK_PATH ON
 )
diff --git a/src/wrt-installer/plugin_utils.cpp b/src/wrt-installer/plugin_utils.cpp
index 3b25cb6..f168866 100644
--- a/src/wrt-installer/plugin_utils.cpp
+++ b/src/wrt-installer/plugin_utils.cpp
@@ -20,6 +20,7 @@
  * @brief   Header file for plugin util
  */
 
+#include <unistd.h>
 #include "plugin_utils.h"
 #include <dpl/exception.h>
 #include <dpl/log/log.h>
-- 
2.7.4