Skip to contentSkip to conversation

tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir

PATCH Applied [email protected] 2 participants 3 messages Aug 8, 2012 – Aug 16, 2012

lore
Share & tools
lore
#0 lore raw

cover tcl: uncomment a line that causing TCL_SRC_DIR point to the workdir

From: Jackie Huang <[email protected]>

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.

---
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(-)
Signature · 1 line
1.7.4
#1 lore raw

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

From: Jackie Huang <[email protected]>

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.

---
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-devtools/tcltk/tcl_8.5.11.bb +1 -1
index f19e25a..e5fe7d3 100644
@@ -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}
Signature · 1 line
1.7.4
Applied
#2 lore raw
In reply to [email protected]
Quoted 15 lines · On 08/07/2012 10:11 PM, [email protected] wrote:

From: Jackie Huang <[email protected]>

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.

---
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:

Quoted 9 lines
   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!