diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-23 23:24:20 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-23 23:41:09 +0000 |
commit | dc2d701207435b0dbd521a11d152f11d0f18d11e (patch) | |
tree | 906e611cc0d2fc042a9a380596e08ba8a7a3306a /meta/recipes-devtools/apt/apt-native.inc | |
parent | bb9dc861b724a620ad60e6e7e71eb54e4ec61589 (diff) | |
download | poky-dc2d701207435b0dbd521a11d152f11d0f18d11e.tar.gz |
apt: Fix locale header and hardcoded libname issues
apt wasn't building on modern libc/compiler combinations due to missing
header includes.
The libcpp version was also being hardcoded, this patch generates it
dynamically to work on different host systems which no longer have
this.
(From OE-Core rev: ca8237ee51053d70b5e7579c224a824db2be76b2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-native.inc')
-rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index d4b207b986..4ca0223988 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc | |||
@@ -40,10 +40,11 @@ do_install_base () { | |||
40 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ | 40 | install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ |
41 | 41 | ||
42 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` | 42 | eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` |
43 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ | 43 | eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` |
44 | ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so | 44 | oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ |
45 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ | 45 | ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so |
46 | ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so | 46 | oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ |
47 | ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so | ||
47 | 48 | ||
48 | install -d ${D}${libdir}/apt/methods | 49 | install -d ${D}${libdir}/apt/methods |
49 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ | 50 | install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ |