summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt-package.inc
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-23 23:24:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-23 23:41:09 +0000
commitdc2d701207435b0dbd521a11d152f11d0f18d11e (patch)
tree906e611cc0d2fc042a9a380596e08ba8a7a3306a /meta/recipes-devtools/apt/apt-package.inc
parentbb9dc861b724a620ad60e6e7e71eb54e4ec61589 (diff)
downloadpoky-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-package.inc')
-rw-r--r--meta/recipes-devtools/apt/apt-package.inc9
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 () {
78 install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ 78 install -m 0755 bin/apt-extracttemplates ${D}${bindir}/
79 79
80 eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` 80 eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'`
81 oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ 81 eval `cat environment.mak | grep ^LIBSTDCPP_VER | sed -e's, = ,=,'`
82 ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so 82 oe_libinstall -so -C bin libapt-pkg$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/
83 oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ 83 ln -sf libapt-pkg$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-pkg.so
84 ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so 84 oe_libinstall -so -C bin libapt-inst$GLIBC_VER$LIBSTDCPP_VER ${D}${libdir}/
85 ln -sf libapt-inst$GLIBC_VER$LIBSTDCPP_VER.so ${D}${libdir}/libapt-inst.so
85 86
86 install -d ${D}${libdir}/apt/methods 87 install -d ${D}${libdir}/apt/methods
87 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ 88 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/