[oe-commits] Stanislav Brabec : tcl: Adapt tclConfig.sh modification to binconfig. class change.

[Martin Jansa]

On Wed, Apr 20, 2011 at 10:04 PM, git version control
<git at git.openembedded.org> wrote:
> Module: openembedded.git
> Branch: master
> Commit: 7c4aeaf7e2a2b96e700cd5230b0e7b415ab08eab
> URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7c4aeaf7e2a2b96e700cd5230b0e7b415ab08eab
>
> Author: Stanislav Brabec <utx at penguin.cz>
> Date:   Wed Apr 20 19:55:49 2011 +0000
>
> tcl: Adapt tclConfig.sh modification to binconfig.class change.
>
> Signed-off-by: Stanislav Brabec <utx at penguin.cz>
>
> ---
>
>  recipes/tcltk/tcl_8.5.8.bb |   13 +++++--------
>  1 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb
> index 9bb6859..82bc1bf 100644
> --- a/recipes/tcltk/tcl_8.5.8.bb
> +++ b/recipes/tcltk/tcl_8.5.8.bb
> @@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language"
>  HOMEPAGE = "http://tcl.sourceforge.net"
>  SECTION = "devel/tcltk"
>  LICENSE = "tcl"
> -PR = "r8"
> +PR = "r9"
>
>  SRC_URI = "\
>   ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
> @@ -33,8 +33,7 @@ do_compile_prepend_pn-tcl () {
>         sed -i -e 's:./tclsh :tclsh :g' Makefile
>  }
>
> -do_install() {
> -        autotools_do_install
> +do_install_append() {
>         # Stage a few extra headers to make tk happy
>         install -d ${D}${includedir}/tcl-${PV}/generic
>         install -m 0644 ../generic/*.h ${D}${includedir}/tcl-${PV}/generic
> @@ -43,6 +42,9 @@ do_install() {
>         install -m 0644 *Unix*.h ${D}${includedir}/tcl-${PV}/unix/
>         rm -f ${D}${includedir}/regex.h
>         ln -sf tclsh8.5 ${D}${bindir}/tclsh
> +       # trick: We set it to incorrect value but binconfig will fix it
> +       # correctly for both target and staging package.
> +       sed -i 's:${includedir}/tcl-private:${STAGING_INCDIR}/tcl-${PV}:' ${D}${libdir}/tclConfig.sh
>  }
>
>  PACKAGES =+ "${PN}-lib"
> @@ -53,8 +55,3 @@ FILES_${PN}-dev += "${libdir}/tclConfig.sh"
>
>  BINCONFIG_GLOB = "*Config.sh"
>  BBCLASSEXTEND = "native"
> -
> -tcl_sysroot() {
> -        sed -i 's:${includedir}/tcl-private:${STAGING_INCDIR}/tcl-${PV}:' tclConfig.sh
> -}
> -

Hi,

there is still
tcl_8.5.8.bb:SYSROOT_PREPROCESS_FUNCS =+ "tcl_sysroot"
and removing tcl_sysroot function results in new warning

NOTE: package tcl-native-8.5.8-r9: task do_populate_sysroot: Started
WARNING: Function tcl_sysroot doesn't exist
NOTE: package tcl-native-8.5.8-r9: task do_populate_sysroot: Succeeded