add missing includes ('unistd.h') for mklibs

This is needed when compiling with GCC >= 4.7.0 since it doesn't implicitly include 'unistd.h' anymore (needed e.g. for file operations in this particular case)

 - Thanks to Luka Perkov

SVN-Revision: 31259

3 files changed, 21 insertions, 11 deletions

diff --git a/tools/mklibs/patches/001-missing_includes.patch b/tools/mklibs/patches/001-missing_includes.patch
new file mode 100644
index 0000000000..9f3485cb1b
--- /dev/null
+++ b/tools/mklibs/patches/001-missing_includes.patch
@@ -0,0 +1,20 @@
+--- a/src/mklibs-readelf/elf.cpp
++++ b/src/mklibs-readelf/elf.cpp
+@@ -25,6 +25,7 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ using namespace Elf;
+ 
+--- a/src/mklibs-readelf/main.cpp
++++ b/src/mklibs-readelf/main.cpp
+@@ -7,6 +7,7 @@
+ 
+ #include <elf.h>
+ #include <getopt.h>
++#include <stdio.h>
+ 
+ #include "elf.hpp"
+ 
diff --git a/tools/mklibs/patches/001-missing_stdio.patch b/tools/mklibs/patches/001-missing_stdio.patch
deleted file mode 100644
index fe05ee29a8..0000000000
--- a/tools/mklibs/patches/001-missing_stdio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/mklibs-readelf/main.cpp
-+++ b/src/mklibs-readelf/main.cpp
-@@ -7,6 +7,7 @@
- 
- #include <elf.h>
- #include <getopt.h>
-+#include <stdio.h>
- 
- #include "elf.hpp"
- 
diff --git a/tools/mklibs/patches/005-readelf_fixes.patch b/tools/mklibs/patches/005-readelf_fixes.patch
index f755942cd8..8ae0954551 100644
--- a/tools/mklibs/patches/005-readelf_fixes.patch
+++ b/tools/mklibs/patches/005-readelf_fixes.patch
@@ -11,7 +11,7 @@
    for (std::vector<Elf::dynamic *>::const_iterator it = section->get_dynamics ().begin (); it != section->get_dynamics ().end (); ++it)
    {
      Elf::dynamic *dynamic = *it;
-@@ -67,6 +71,9 @@ static void process_dynamics (Elf::file 
+@@ -67,6 +71,9 @@ static void process_dynamics (Elf::file
  
  static void process_symbols_provided (const Elf::section_type<Elf::section_type_DYNSYM> *section)
  {