Patchwork tcl: Fix packaging of platform independent files

login
register
mail settings
Submitter Kumar Gala
Date Aug. 3, 2011, 3:43 p.m.
Message ID <1312386236-11826-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/9129/
State New, archived
Headers show

Comments

Kumar Gala - Aug. 3, 2011, 3:43 p.m.
Tcl's doesn't utilize ${baselib} for platform independent files but
defines it as follows:

TCL_LIBRARY             = $(prefix)/lib/tcl$(VERSION)

Match that so if ${baselib} is not just /lib things work properly.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 meta/recipes-devtools/tcltk/tcl_8.5.9.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Aug. 3, 2011, 5:07 p.m.
On Wed, 2011-08-03 at 10:43 -0500, Kumar Gala wrote:
> Tcl's doesn't utilize ${baselib} for platform independent files but
> defines it as follows:
> 
> TCL_LIBRARY             = $(prefix)/lib/tcl$(VERSION)
> 
> Match that so if ${baselib} is not just /lib things work properly.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
>  meta/recipes-devtools/tcltk/tcl_8.5.9.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard
Khem Raj - Aug. 3, 2011, 6:07 p.m.
On Wed, Aug 3, 2011 at 8:43 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
> Tcl's doesn't utilize ${baselib} for platform independent files but
> defines it as follows:
>
> TCL_LIBRARY             = $(prefix)/lib/tcl$(VERSION)
>
> Match that so if ${baselib} is not just /lib things work properly.


hmm may be fixing tcl to honour --libdir=<dir> to generate TCL_LIBRARY
from configure would be a nice solution

>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
>  meta/recipes-devtools/tcltk/tcl_8.5.9.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
> index 12e2bd0..2eabb4d 100644
> --- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
> +++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
>     file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
>     "
>
> -PR = "r0"
> +PR = "r1"
>
>  BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
>                 file://tcl-add-soname.patch"
> @@ -59,7 +59,7 @@ do_install() {
>
>  PACKAGES =+ "${PN}-lib"
>  FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
> -FILES_${PN} += "${libdir}/tcl8.5"
> +FILES_${PN} += "${prefix}/lib/tcl8.5"
>  FILES_${PN}-dev += "${libdir}/tclConfig.sh"
>
>  BBCLASSEXTEND = "native"
> --
> 1.7.3.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Phil Blundell - Aug. 3, 2011, 8:03 p.m.
On Wed, 2011-08-03 at 10:43 -0500, Kumar Gala wrote:
> Tcl's doesn't utilize ${baselib} for platform independent files but
> defines it as follows:
> 
> TCL_LIBRARY             = $(prefix)/lib/tcl$(VERSION)
> 
> Match that so if ${baselib} is not just /lib things work properly.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---

Even better would be bashing tcl so that it puts its bits in ${datadir}
where they belong. :-)  But your patch is fine though.

p.
Richard Purdie - Aug. 4, 2011, 2:36 p.m.
On Wed, 2011-08-03 at 21:03 +0100, Phil Blundell wrote:
> On Wed, 2011-08-03 at 10:43 -0500, Kumar Gala wrote:
> > Tcl's doesn't utilize ${baselib} for platform independent files but
> > defines it as follows:
> > 
> > TCL_LIBRARY             = $(prefix)/lib/tcl$(VERSION)
> > 
> > Match that so if ${baselib} is not just /lib things work properly.
> > 
> > Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> > ---
> 
> Even better would be bashing tcl so that it puts its bits in ${datadir}
> where they belong. :-)  But your patch is fine though.

Agreed, this would be the ideal solution...

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
index 12e2bd0..2eabb4d 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.9.bb
@@ -11,7 +11,7 @@  LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
     file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
     "
 
-PR = "r0"
+PR = "r1"
 
 BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
                 file://tcl-add-soname.patch"
@@ -59,7 +59,7 @@  do_install() {
 
 PACKAGES =+ "${PN}-lib"
 FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
-FILES_${PN} += "${libdir}/tcl8.5"
+FILES_${PN} += "${prefix}/lib/tcl8.5"
 FILES_${PN}-dev += "${libdir}/tclConfig.sh"
 
 BBCLASSEXTEND = "native"