From e2dbad7b7db7b62dee4bb5b6c28a5ab4dde08358 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 16 Feb 2011 17:16:39 +0800 Subject: mklibs-native: fix the build on Ubuntu 9.04 by defining STT_GNU_IFUNC mklibs-native needs elf.h (that is supplied by libc6-dev). since STAGING_INCDIR_NATIVE doesn't contain elf.h (we don't have eglibc-native), so the host's /usr/include/elf.h is used. Unluckily, the libc6-dev in Ubuntu 9.04 is so old that the elf.h doesn't define STT_GNU_IFUNC, so we have to define it ourselves. Fixes [BUGID #726] Signed-off-by: Dexuan Cui --- .../mklibs/files/fix_STT_GNU_IFUNC.patch | 23 ++++++++++++++++++++++ .../mklibs/mklibs-native_0.1.31.bb | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch diff --git a/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch b/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch new file mode 100644 index 000000000..88baddeda --- /dev/null +++ b/meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch @@ -0,0 +1,23 @@ +The libc6-dev in Ubuntu 9.04 is so old that the elf.h doesn't +define STT_GNU_IFUNC, so we have to define it ourselves. +-- Dexuan Cui (dexuan.cui@intel.com) Feb 16, 2011. + +diff --git a/src/mklibs-readelf/main.cpp b/src/mklibs-readelf/main.cpp +index 2444c39..56d93f8 100644 +--- a/src/mklibs-readelf/main.cpp ++++ b/src/mklibs-readelf/main.cpp +@@ -6,6 +6,14 @@ + #include + + #include ++/* ++ * The /usr/include/elf.h in some distributions(like Ubuntu 9.04) doesn't ++ * define the macro. We need to define it here. ++ */ ++#ifndef STT_GNU_IFUNC ++#define STT_GNU_IFUNC 10 /* Symbol is indirect code object */ ++#endif ++ + #include + + #include "elf.hpp" diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.31.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.31.bb index 2044d125e..7f4afc09f 100644 --- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.31.bb +++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.31.bb @@ -5,10 +5,11 @@ 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\ " SRC_URI[md5sum] = "f4df0307ccbdf60070e42277513f27ed" -- cgit v1.2.3