Patchwork tcl 8.5.11: fix packaging

login
register
mail settings
Submitter Koen Kooi
Date Feb. 28, 2012, 7:58 a.m.
Message ID <1330415917-3451-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/22301/
State Accepted
Commit 77eaa55d94e8ce73aa3c43b1f068d6ad4cf20e80
Headers show

Comments

Koen Kooi - Feb. 28, 2012, 7:58 a.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>
---
 meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Richard Purdie - Feb. 28, 2012, 1:22 p.m.
On Tue, 2012-02-28 at 08:58 +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>
> ---
>  meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    7 +++++--
>  1 files changed, 5 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 146021a..a9a41fb 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 = "r3"
>  
>  BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
>                  file://tcl-add-soname.patch"
> @@ -59,7 +59,10 @@ do_install() {
>  
>  PACKAGES =+ "${PN}-lib"
>  FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
> -FILES_${PN} += "${prefix}/lib/tcl8.5"
> +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} += "${PN}-lib"
> +
>  BBCLASSEXTEND = "native"


ERROR: Nothing RPROVIDES 'tcl-native-lib-native' (but virtual:native:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly/build/meta/recipes-devtools/tcltk/tcl_8.5.11.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'tcl-native-lib-native' is unbuildable, removing.

This needs to be spelt out as tcl-lib instead of ${PN}-lib...

Cheers,

Richard
Koen Kooi - Feb. 28, 2012, 1:24 p.m.
Op 28 feb. 2012, om 14:22 heeft Richard Purdie het volgende geschreven:

> On Tue, 2012-02-28 at 08:58 +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>
>> ---
>> meta/recipes-devtools/tcltk/tcl_8.5.11.bb |    7 +++++--
>> 1 files changed, 5 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 146021a..a9a41fb 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 = "r3"
>> 
>> BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
>>                 file://tcl-add-soname.patch"
>> @@ -59,7 +59,10 @@ do_install() {
>> 
>> PACKAGES =+ "${PN}-lib"
>> FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
>> -FILES_${PN} += "${prefix}/lib/tcl8.5"
>> +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} += "${PN}-lib"
>> +
>> BBCLASSEXTEND = "native"
> 
> 
> ERROR: Nothing RPROVIDES 'tcl-native-lib-native' (but virtual:native:/srv/home/pokybuild/yocto-autobuilder/yocto-slave/nightly/build/meta/recipes-devtools/tcltk/tcl_8.5.11.bb RDEPENDS on or otherwise requires it)
> NOTE: Runtime target 'tcl-native-lib-native' is unbuildable, removing.
> 
> This needs to be spelt out as tcl-lib instead of ${PN}-lib...

Argh, bitbake -b strikes again :(

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..a9a41fb 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 = "r3"
 
 BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
                 file://tcl-add-soname.patch"
@@ -59,7 +59,10 @@  do_install() {
 
 PACKAGES =+ "${PN}-lib"
 FILES_${PN}-lib = "${libdir}/libtcl8.5.so*"
-FILES_${PN} += "${prefix}/lib/tcl8.5"
+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} += "${PN}-lib"
+
 BBCLASSEXTEND = "native"