aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-04-12 07:49:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-13 12:05:53 +0100
commit898bee7a4e97d74e5da4381188a2f3e030d3f0e4 (patch)
treea8dabf9669463d1eb4c53a1bc36592475a315538 /meta
parent100e3c9b75c17299ea8eaac94c94c078412b0800 (diff)
downloadpoky-898bee7a4e97d74e5da4381188a2f3e030d3f0e4.tar.gz
poky-898bee7a4e97d74e5da4381188a2f3e030d3f0e4.tar.bz2
poky-898bee7a4e97d74e5da4381188a2f3e030d3f0e4.zip
mklibs-native 0.1.33: include unistd.h to fix build for gcc 4.7
Many of the standard C++ library include files have been edited to no longer include <unistd.h> to remove namespace pollution in gcc 4.7, so we need include <unistd.h> manually sometimes. More information: http://gcc.gnu.org/gcc-4.7/porting_to.html [YOCTO #2278] (From OE-Core rev: 5e3c12313edc4b51ddd432ecbbd3b1f5295b3c14) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> [Updated patch header - sgw] Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch43
-rw-r--r--meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb3
2 files changed, 45 insertions, 1 deletions
diff --git a/meta/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch b/meta/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch
new file mode 100644
index 0000000000..baa12bdaaa
--- /dev/null
+++ b/meta/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch
@@ -0,0 +1,43 @@
+include <unistd.h> to fix build on gcc 4.7
+
+Many of the standard C++ library include files have been edited to no
+longer include <unistd.h> to remove namespace pollution in gcc 4.7, so
+we need include <unistd.h> manually sometimes.
+
+mklibs (0.1.33+nmu1) UNRELEASED; urgency=low
+ * Non-maintainer upload
+ * Fix FTBFS with gcc 4.7 due to missing <unistd.h> include (Closes: #667282).
+
+-- Cyril Brulebois <kibi@debian.org> Thu, 05 Apr 2012 00:15:27 +0000
+
+mklibs (0.1.33) unstable; urgency=low
+
+ * Adjust the libc_pic directory for multiarch as well.
+
+Upstream-Status: Backport
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+[Added upstream information about patch]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+---
+ src/mklibs-readelf/elf.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mklibs-readelf/elf.cpp b/src/mklibs-readelf/elf.cpp
+index 444f330..654c46f 100644
+--- 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;
+
+--
+1.7.10
+
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb
index d288c77afb..a8d12ec17d 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb
@@ -5,11 +5,12 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
DEPENDS = "python-native"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.gz \
file://ac_init_fix.patch\
file://fix_STT_GNU_IFUNC.patch\
+ file://include-unistd.h-for-gcc47.patch \
"
SRC_URI[md5sum] = "a462d9b802164993d247c1193116d78b"