From: Kai Kang <[email protected]>
Remove redundant replacement of pkgconfig file and only modify the .pc
file which is installed in ${D}.
Replace /usr/bin with ${bindir} at same time.
Signed-off-by: Kai Kang <[email protected]>
---
meta/recipes-devtools/guile/guile_2.0.11.bb | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb
b/meta/recipes-devtools/guile/guile_2.0.11.bb
index 98b465b..fa45008 100644
--- a/meta/recipes-devtools/guile/guile_2.0.11.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.11.bb
@@ -57,19 +57,6 @@ do_configure_prepend() {
export GUILE_FOR_BUILD="${BUILD_SYS}-guile"
-do_compile_append() {
- # just for target recipe
- if [ "${PN}" = "guile" ]
- then
- sed -i -e s:${STAGING_DIR_TARGET}::g \
- -e s:/${TARGET_SYS}::g \
- -e s:-L/usr/lib::g \
- -e s:-isystem/usr/include::g \
- -e s:,/usr/lib:,\$\{libdir\}:g \
- meta/guile-2.0.pc
- fi
-}
-
do_install_append_class-native() {
install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile
@@ -83,8 +70,10 @@ do_install_append_class-native() {
do_install_append_class-target() {
# cleanup buildpaths in scripts
- sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}/usr/bin/guile-config
- sed -i -e 's:${STAGING_DIR_HOST}::' ${D}/usr/bin/guile-snarf
+ sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}${bindir}/guile-config
+ sed -i -e 's:${STAGING_DIR_HOST}::' ${D}${bindir}/guile-snarf
+
+ sed -i -e 's:${STAGING_DIR_TARGET}::g'
${D}${libdir}/pkgconfig/guile-2.0.pc
}
SYSROOT_PREPROCESS_FUNCS = "guile_cross_config"
--
2.6.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
