Patchwork [v2] tcl 8.5.11: fix packaging

login
register
mail settings
Submitter Koen Kooi
Date Feb. 28, 2012, 1:25 p.m.
Message ID <1330435555-21482-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/22313/
State New
Headers show

Comments

Koen Kooi - Feb. 28, 2012, 1:25 p.m.
Include /usr/lib/tcl8 for the msgcat and test module, force dependency on tcl-lib since shlibs isn't picking it up.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---

Changes from v1: ${PN}-lib -> tcl-lib

 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
Richard Purdie - Feb. 28, 2012, 1:36 p.m.
On Tue, 2012-02-28 at 14:25 +0100, Koen Kooi wrote:
> Include /usr/lib/tcl8 for the msgcat and test module, force dependency on tcl-lib since shlibs isn't picking it up.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> 
> Changes from v1: ${PN}-lib -> tcl-lib
> 
>  meta/recipes-devtools/tcltk/tcl_8.5.11.bb |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
> index 146021a..ef1b76d 100644
> --- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
> +++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
>      file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
>      "
>  
> -PR = "r2"
> +PR = "r4"
>  
>  BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
>                  file://tcl-add-soname.patch"
> @@ -57,9 +57,12 @@ do_install() {
>  	done
>  }
>  
> -PACKAGES =+ "${PN}-lib"
> -FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
> -FILES_${PN} += "${prefix}/lib/tcl8.5"
> +PACKAGES =+ "tcl-lib"
> +FILES_tcl-lib = "${libdir}/libtcl8.5.so*"
> +FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8"
>  FILES_${PN}-dev += "${libdir}/tclConfig.sh"
>  
> +# isn't getting picked up by shlibs code
> +RDEPENDS_${PN} += "tcl-lib"
> +
>  BBCLASSEXTEND = "native"

I'd merged the original so I've squashed a revert of that with this
commit and pushed that :/.

I've also realised we could have used BPN here but I think this fix is
fine.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
index 146021a..ef1b76d 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.5.11.bb
@@ -11,7 +11,7 @@  LIC_FILES_CHKSUM = "file://../license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11
     file://../win/license.terms;md5=a47a9be26d03f925fc1fbd2784f27e11 \
     "
 
-PR = "r2"
+PR = "r4"
 
 BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
                 file://tcl-add-soname.patch"
@@ -57,9 +57,12 @@  do_install() {
 	done
 }
 
-PACKAGES =+ "${PN}-lib"
-FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
-FILES_${PN} += "${prefix}/lib/tcl8.5"
+PACKAGES =+ "tcl-lib"
+FILES_tcl-lib = "${libdir}/libtcl8.5.so*"
+FILES_${PN} += "${prefix}/lib/tcl8.5 ${prefix}/lib/tcl8"
 FILES_${PN}-dev += "${libdir}/tclConfig.sh"
 
+# isn't getting picked up by shlibs code
+RDEPENDS_${PN} += "tcl-lib"
+
 BBCLASSEXTEND = "native"