From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 8 Jun 2012 14:37:13 +0000 (+0000)
Subject: [backfire] mklibs: merge r31259
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=8b9f1724276bf30408ffc0ddb695b179c4c4a200;hp=cb3fe864af7ea801b1171676a34866b596b9f428

[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
index 000000000..9f3485cb1
--- /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 fe05ee29a..000000000
--- 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 f755942cd..8ae095455 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)
  {