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-24 17:54:24 +0100 |
commit | 6363a95550c1b78f8d9788de8b1d2cea7b06837a (patch) | |
tree | 541f34febe6f6b858ee48cd5ad51a09a7d18cd60 | |
parent | 6d1447ba2d8b1c76fd1f0d26aee250fb82cbeddd (diff) | |
download | poky-6363a95550c1b78f8d9788de8b1d2cea7b06837a.tar.gz |
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
(From OE-Core rev: 3c0e761b264e4420dffccda8ef0492ad1ae15f43)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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" | |||
39 | # add guile-native only to the target recipe's DEPENDS | 39 | # add guile-native only to the target recipe's DEPENDS |
40 | DEPENDS_append_class-target = " guile-native libatomic-ops" | 40 | DEPENDS_append_class-target = " guile-native libatomic-ops" |
41 | 41 | ||
42 | RDEPENDS_${PN}_append_libc-glibc_class-target = "glibc-gconv-iso8859-1" | 42 | # The comment of the script guile-config said it has been deprecated but we should |
43 | # at least add the required dependency to make it work since we still provide the script. | ||
44 | RDEPENDS_${PN} = "pkgconfig" | ||
45 | |||
46 | RDEPENDS_${PN}_append_libc-glibc_class-target = " glibc-gconv-iso8859-1" | ||
43 | 47 | ||
44 | EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}" | 48 | EXTRA_OECONF += "${@['--without-libltdl-prefix --without-libgmp-prefix --without-libreadline-prefix', ''][bb.data.inherits_class('native',d)]}" |
45 | 49 | ||
@@ -77,6 +81,12 @@ do_install_append_class-native() { | |||
77 | GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache | 81 | GUILE_LOAD_COMPILED_PATH=${STAGING_LIBDIR_NATIVE}/guile/2.0/ccache |
78 | } | 82 | } |
79 | 83 | ||
84 | do_install_append_class-target() { | ||
85 | # cleanup buildpaths in scripts | ||
86 | sed -i -e 's:${STAGING_DIR_NATIVE}::' ${D}/usr/bin/guile-config | ||
87 | sed -i -e 's:${STAGING_DIR_HOST}::' ${D}/usr/bin/guile-snarf | ||
88 | } | ||
89 | |||
80 | SYSROOT_PREPROCESS_FUNCS = "guile_cross_config" | 90 | SYSROOT_PREPROCESS_FUNCS = "guile_cross_config" |
81 | 91 | ||
82 | guile_cross_config() { | 92 | guile_cross_config() { |