diff options
| author | Jackie Huang <jackie.huang@windriver.com> | 2015-09-23 16:41:57 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 22:07:18 +0100 |
| commit | 3c0e761b264e4420dffccda8ef0492ad1ae15f43 (patch) | |
| tree | 9f5316b37f6f777b01e00fe2bc0f96a077982763 /meta/recipes-devtools | |
| parent | e03d95d70f8bfe57c258d270ac6b3331650dbc10 (diff) | |
| download | openembedded-core-3c0e761b264e4420dffccda8ef0492ad1ae15f43.tar.gz openembedded-core-3c0e761b264e4420dffccda8ef0492ad1ae15f43.tar.bz2 openembedded-core-3c0e761b264e4420dffccda8ef0492ad1ae15f43.zip | |
guile: cleanup buildpaths and add RDEPENDS on pkgconfig
* fix the path for "define %pkg-config-program" in guile-config
* clean the --sysroot in guile-snarf
* add RDEPENDS on pkgconfig
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.11.bb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-devtools/guile/guile_2.0.11.bb b/meta/recipes-devtools/guile/guile_2.0.11.bb index 486969422c..f4557409a1 100644 --- a/meta/recipes-devtools/guile/guile_2.0.11.bb +++ b/meta/recipes-devtools/guile/guile_2.0.11.bb @@ -39,7 +39,11 @@ DEPENDS = "libunistring bdwgc gmp libtool libffi ncurses readline" # add guile-native only to the target recipe's DEPENDS DEPENDS_append_class-target = " guile-native libatomic-ops" -RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1" +# The comment of the script guile-config said it has been deprecated but we should +# at least add the required dependency to make it work since we still provide the script. +RDEPENDS_${PN} = "pkgconfig" + +RDEPENDS_${PN}_append_libc-glibc_class-target = " glibc-gconv-iso8859-1" EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}" @@ -77,6 +81,12 @@ do_install_append_class-native() { GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache } +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 +} + SYSROOT_PREPROCESS_FUNCS = "guile_cross_config" guile_cross_config() { |