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:39:39 +0000 |
| commit | ca8237ee51053d70b5e7579c224a824db2be76b2 (patch) | |
| tree | 6f9a3c6eabf965d18d890155e86a8594802317cb /meta/recipes-devtools/apt/apt-native.inc | |
| parent | 7056ea9b1eb5ff358c1f8d2b949597e4e98f3a2b (diff) | |
| download | openembedded-core-ca8237ee51053d70b5e7579c224a824db2be76b2.tar.gz openembedded-core-ca8237ee51053d70b5e7579c224a824db2be76b2.tar.bz2 openembedded-core-ca8237ee51053d70b5e7579c224a824db2be76b2.zip | |
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.
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 () { install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'` + oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so + oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/ + ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ |