From 403d6d8d7b7d70435a33574116430813d9185c0e Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Thu, 12 Apr 2012 12:19:56 +0000 Subject: [PATCH] [tools/mklibs] 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 --- .../mklibs/patches/001-missing_includes.patch | 20 +++++++++++++++++++ tools/mklibs/patches/001-missing_stdio.patch | 10 ---------- tools/mklibs/patches/005-readelf_fixes.patch | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 tools/mklibs/patches/001-missing_includes.patch delete mode 100644 tools/mklibs/patches/001-missing_stdio.patch 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 + #include + #include ++#include + + using namespace Elf; + +--- a/src/mklibs-readelf/main.cpp ++++ b/src/mklibs-readelf/main.cpp +@@ -7,6 +7,7 @@ + + #include + #include ++#include + + #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 - #include -+#include - - #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::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 *section) { -- 2.30.2