mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

guile: cleanup buildpaths and add RDEPENDS on pkgconfig

Browse Source 
* 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>
This commit is contained in:
Jackie Huang
2015-09-23 16:41:57 +08:00
committed by Richard Purdie
parent 6d1447ba2d
commit 6363a95550
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/recipes-devtools/guile/guile_2.0.11.bb
View File

@@ -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() {