summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/mklibs
diff options
context:
space:
mode:
authorJonathan Santos <jrsantos@jonathanrsantos.com>2012-06-27 13:25:22 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-29 13:31:02 +0100
commit7a4cc0e8845fbee6a9066e8d83a90bcb8acc96be (patch)
tree9a8a767f2e05c4fb62666e307e46bdda5f86c4e0 /meta/recipes-devtools/mklibs
parent552883c16915b29a07561b230fc4e164be126673 (diff)
downloadpoky-7a4cc0e8845fbee6a9066e8d83a90bcb8acc96be.tar.gz
mklibs-native: Upgrade to 0.1.34
include-unistd.h-for-gcc47.patch is no longer needed, since it was fixed upstream. (From OE-Core rev: 54429dfcca0e35a3aeaa78e509240b87d6a8f4ac) Signed-off-by: Jonathan Santos <jrsantos@jonathanrsantos.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mklibs')
-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.34.bb (renamed from meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb)9
2 files changed, 3 insertions, 49 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
deleted file mode 100644
index baa12bdaaa..0000000000
--- a/meta/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1include <unistd.h> to fix build on gcc 4.7
2
3Many of the standard C++ library include files have been edited to no
4longer include <unistd.h> to remove namespace pollution in gcc 4.7, so
5we need include <unistd.h> manually sometimes.
6
7mklibs (0.1.33+nmu1) UNRELEASED; urgency=low
8 * Non-maintainer upload
9 * Fix FTBFS with gcc 4.7 due to missing <unistd.h> include (Closes: #667282).
10
11-- Cyril Brulebois <kibi@debian.org> Thu, 05 Apr 2012 00:15:27 +0000
12
13mklibs (0.1.33) unstable; urgency=low
14
15 * Adjust the libc_pic directory for multiarch as well.
16
17Upstream-Status: Backport
18
19Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
20
21[Added upstream information about patch]
22
23Signed-off-by: Saul Wold <sgw@linux.intel.com>
24
25---
26 src/mklibs-readelf/elf.cpp | 1 +
27 1 file changed, 1 insertion(+)
28
29diff --git a/src/mklibs-readelf/elf.cpp b/src/mklibs-readelf/elf.cpp
30index 444f330..654c46f 100644
31--- a/src/mklibs-readelf/elf.cpp
32+++ b/src/mklibs-readelf/elf.cpp
33@@ -25,6 +25,7 @@
34 #include <fcntl.h>
35 #include <sys/mman.h>
36 #include <sys/stat.h>
37+#include <unistd.h>
38
39 using namespace Elf;
40
41--
421.7.10
43
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.34.bb
index a8d12ec17d..f2c303337e 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.33.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.34.bb
@@ -5,18 +5,15 @@ LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64" 5LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64"
6DEPENDS = "python-native" 6DEPENDS = "python-native"
7 7
8PR = "r1" 8PR = "r0"
9 9
10SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.gz \ 10SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.gz \
11 file://ac_init_fix.patch\ 11 file://ac_init_fix.patch\
12 file://fix_STT_GNU_IFUNC.patch\ 12 file://fix_STT_GNU_IFUNC.patch\
13 file://include-unistd.h-for-gcc47.patch \
14" 13"
15 14
16SRC_URI[md5sum] = "a462d9b802164993d247c1193116d78b" 15SRC_URI[md5sum] = "afe0ed527ba96b8a882b5de350603007"
17SRC_URI[sha256sum] = "706aa22ec979bc54adaf9616d278cecc2f1e8cd5faa656269c9760e8669fcc1e" 16SRC_URI[sha256sum] = "0c13c314f5c397529f58a5a02d57d83aeb4463d6a0d80b9374c6576ec37ed39f"
18
19S = "${WORKDIR}/${BPN}"
20 17
21inherit autotools gettext native 18inherit autotools gettext native
22 19