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>

1 files changed, 5 insertions, 4 deletions

diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index dde916e3da..d644b09745 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -78,10 +78,11 @@ do_install () {
         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/