diff options
| -rw-r--r-- | meta/recipes-devtools/mklibs/files/include-unistd.h-for-gcc47.patch | 43 | ||||
| -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 @@ -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.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+" LIC_FILES_CHKSUM = "file://debian/copyright;md5=98d31037b13d896e33890738ef01af64" DEPENDS = "python-native" -PR = "r1" +PR = "r0" 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" -SRC_URI[sha256sum] = "706aa22ec979bc54adaf9616d278cecc2f1e8cd5faa656269c9760e8669fcc1e" - -S = "${WORKDIR}/${BPN}" +SRC_URI[md5sum] = "afe0ed527ba96b8a882b5de350603007" +SRC_URI[sha256sum] = "0c13c314f5c397529f58a5a02d57d83aeb4463d6a0d80b9374c6576ec37ed39f" inherit autotools gettext native |