Patchwork tcl: fix tcl INCLUDE_SPEC and LIB_SPEC

login
register
mail settings
Submitter Yao Zhao
Date July 18, 2012, 4:42 p.m.
Message ID <1342629755-23841-1-git-send-email-yao.zhao@windriver.com>
Download mbox | patch
Permalink /patch/32421/
State Accepted
Commit d454f8055b21c4d01dd1e2faf1625e2a1e5c25f2
Headers show

Comments

Yao Zhao - July 18, 2012, 4:42 p.m.
TCL_INCLUDE_SPEC -I/usr/include will cause problems cross configure/compile
TCL_LIB_SPEC -L${libdir} will cause problems too when link.

Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
---
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Saul Wold - July 20, 2012, 4:09 a.m.
On 07/18/2012 09:42 AM, Yao Zhao wrote:
> TCL_INCLUDE_SPEC -I/usr/include will cause problems cross configure/compile
> TCL_LIB_SPEC -L${libdir} will cause problems too when link.
>
> Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
> ---
>   meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
> index 1d43371..d5cf6dc 100644
> --- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
> +++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
> @@ -46,8 +46,9 @@ 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,-L${libdir},," 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 ${STAGING_BINDIR_CROSS}/
>   	install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS}
>   	cd ..
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index 1d43371..d5cf6dc 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -46,8 +46,9 @@  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,-L${libdir},," 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 ${STAGING_BINDIR_CROSS}/
 	install -m 0755 tclConfig.sh ${STAGING_BINDIR_CROSS}
 	cd ..