diff options
| author | Kai Kang <kai.kang@windriver.com> | 2015-12-22 09:04:53 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-27 11:26:59 +0000 |
| commit | 9078d1d758b70b2df047b3d7fcf332231db9e9c7 (patch) | |
| tree | ba418c9f5da88ec3862e709abbd716c123ddc105 | |
| parent | b49751e7febd262b754043e4e523e6690bfbbfaa (diff) | |
| download | openembedded-core-9078d1d758b70b2df047b3d7fcf332231db9e9c7.tar.gz openembedded-core-9078d1d758b70b2df047b3d7fcf332231db9e9c7.tar.bz2 openembedded-core-9078d1d758b70b2df047b3d7fcf332231db9e9c7.zip | |
guile: remove redundant replacement of .pc file
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 <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.11.bb | 19 |
1 files 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 98b465bfdb..fa45008e07 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" |