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-28 09:25:17 +0000 |
| commit | cfbd8043e63ce68b700b3bcaa142b0d0a8679c76 (patch) | |
| tree | 7aef8186ef23674c992da6ab81a336455c5956a7 | |
| parent | c2e8079e87b184f064b7113da4314f869804f2ca (diff) | |
| download | poky-cfbd8043e63ce68b700b3bcaa142b0d0a8679c76.tar.gz | |
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.
(From OE-Core rev: 9078d1d758b70b2df047b3d7fcf332231db9e9c7)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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() { | |||
| 57 | 57 | ||
| 58 | export GUILE_FOR_BUILD="${BUILD_SYS}-guile" | 58 | export GUILE_FOR_BUILD="${BUILD_SYS}-guile" |
| 59 | 59 | ||
| 60 | do_compile_append() { | ||
| 61 | # just for target recipe | ||
| 62 | if [ "${PN}" = "guile" ] | ||
| 63 | then | ||
| 64 | sed -i -e s:${STAGING_DIR_TARGET}::g \ | ||
| 65 | -e s:/${TARGET_SYS}::g \ | ||
| 66 | -e s:-L/usr/lib::g \ | ||
| 67 | -e s:-isystem/usr/include::g \ | ||
| 68 | -e s:,/usr/lib:,\$\{libdir\}:g \ | ||
| 69 | meta/guile-2.0.pc | ||
| 70 | fi | ||
| 71 | } | ||
| 72 | |||
| 73 | do_install_append_class-native() { | 60 | do_install_append_class-native() { |
| 74 | install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile | 61 | install -m 0755 ${D}${bindir}/guile ${D}${bindir}/${HOST_SYS}-guile |
| 75 | 62 | ||
| @@ -83,8 +70,10 @@ do_install_append_class-native() { | |||
| 83 | 70 | ||
| 84 | do_install_append_class-target() { | 71 | do_install_append_class-target() { |
| 85 | # cleanup buildpaths in scripts | 72 | # cleanup buildpaths in scripts |
| 86 | sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}/usr/bin/guile-config | 73 | sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}${bindir}/guile-config |
| 87 | sed -i -e 's:${STAGING_DIR_HOST}::' ${D}/usr/bin/guile-snarf | 74 | sed -i -e 's:${STAGING_DIR_HOST}::' ${D}${bindir}/guile-snarf |
| 75 | |||
| 76 | sed -i -e 's:${STAGING_DIR_TARGET}::g' ${D}${libdir}/pkgconfig/guile-2.0.pc | ||
| 88 | } | 77 | } |
| 89 | 78 | ||
| 90 | SYSROOT_PREPROCESS_FUNCS = "guile_cross_config" | 79 | SYSROOT_PREPROCESS_FUNCS = "guile_cross_config" |
