[backfire] mklibs: merge r31259

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@32128 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/tools/mklibs/patches/001-missing_includes.patch b/tools/mklibs/patches/001-missing_includes.patch
new file mode 100644 (file)
index 0000000..9f3485c
--- /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 (file)
index fe05ee2..0000000
--- 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 f755942cd8a586bb973b057d83d94c8b59a24f60..8ae095455134e9fee836a621bd89015193413d6b 100644 (file)
--- 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)
  {