aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mklibs
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-04-12 12:19:56 +0000
committerMirko Vogt <mirko@openwrt.org>2012-04-12 12:19:56 +0000
commit4879e3f58a284e6afd51899140abd6df30ef8408 (patch)
tree0654667a896f59ced07e39a08a9034d8aeb420cf /tools/mklibs
parentb8a67c67b061351e31750841968e049746cbc8a2 (diff)
downloadupstream-4879e3f58a284e6afd51899140abd6df30ef8408.tar.gz
upstream-4879e3f58a284e6afd51899140abd6df30ef8408.tar.bz2
upstream-4879e3f58a284e6afd51899140abd6df30ef8408.zip
[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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31259 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mklibs')
-rw-r--r--tools/mklibs/patches/001-missing_includes.patch20
-rw-r--r--tools/mklibs/patches/001-missing_stdio.patch10
-rw-r--r--tools/mklibs/patches/005-readelf_fixes.patch2
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)
{