[PATCH 0/1] tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir

[PATCH 0/1] tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

The line 'sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh'
is commented somehow in previous commit, so that TCL_SRC_DIR
point to the tcl workdir which will cause package that use it
fail to configure or compile when the tcl workdir is removed,
so uncomment it back.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
The following changes since commit 1e873271362b770381903098d46c4aec164d81de:

  automake: Fix version reference in path substitutions (2012-08-07 23:35:54 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib jhuang0/expect_failed_0808
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/expect_failed_0808

Jackie Huang (1):
  tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir.

 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- 
1.7.4

[PATCH 1/1] tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir.

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

The line 'sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh'
is commented somehow in previous commit, so that TCL_SRC_DIR
point to the tcl workdir which will cause package that use it
fail to configure or compile when the tcl workdir is removed,
so uncomment it back.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index f19e25a..e5fe7d3 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -46,7 +46,7 @@ do_install() {
 	autotools_do_install
 	oe_libinstall -so libtcl8.5 ${STAGING_LIBDIR}
 	ln -sf ./tclsh8.5 ${D}${bindir}/tclsh
-	#sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
+	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
 	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh 
 	install -d ${D}${bindir_crossscripts}
-- 
1.7.4

Re: [PATCH 0/1] tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir

[Saul Wold]

On 08/07/2012 10:11 PM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> The line 'sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh'
> is commented somehow in previous commit, so that TCL_SRC_DIR
> point to the tcl workdir which will cause package that use it
> fail to configure or compile when the tcl workdir is removed,
> so uncomment it back.
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> The following changes since commit 1e873271362b770381903098d46c4aec164d81de:
>
>    automake: Fix version reference in path substitutions (2012-08-07 23:35:54 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib jhuang0/expect_failed_0808
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/expect_failed_0808
>
> Jackie Huang (1):
>    tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir.
>
>   meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
Merged into OE-Core

Thanks
	Sau!