Skip to contentSkip to conversation

Stanislav Brabec : tcl: Adapt tclConfig.sh modification to binconfig. class change.

oe-commits Martin Jansa 2 participants 2 messages Apr 20, 2011 – Apr 21, 2011 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 54 lines · git version control

Module: openembedded.git
Branch: master
Commit: 7c4aeaf7e2a2b96e700cd5230b0e7b415ab08eab
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7c4aeaf7e2a2b96e700cd5230b0e7b415ab08eab

Author: Stanislav Brabec <[email protected]>
Date:   Wed Apr 20 19:55:49 2011 +0000

tcl: Adapt tclConfig.sh modification to binconfig.class change.

---

 recipes/tcltk/tcl_8.5.8.bb |   13 +++++--------

 1 files changed, 5 insertions(+), 8 deletions(-)
recipes/tcltk/tcl_8.5.8.bb +0 -0
index 9bb6859..82bc1bf 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Tool Command Language"

 HOMEPAGE = "http://tcl.sourceforge.net"
 SECTION = "devel/tcltk"
 LICENSE = "tcl"

recipes/tcltk/tcl_8.5.8.bb +1 -1
-PR = "r8"
+PR = "r9"

 SRC_URI = "\
  ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \

recipes/tcltk/tcl_8.5.8.bb +0 -0
@@ -33,8 +33,7 @@ do_compile_prepend_pn-tcl () {

        sed -i -e 's:./tclsh :tclsh :g' Makefile
 }

recipes/tcltk/tcl_8.5.8.bb +1 -2
-do_install() {
-        autotools_do_install
+do_install_append() {

        # Stage a few extra headers to make tk happy
        install -d ${D}${includedir}/tcl-${PV}/generic
        install -m 0644 ../generic/*.h ${D}${includedir}/tcl-${PV}/generic

recipes/tcltk/tcl_8.5.8.bb +0 -0
@@ -43,6 +42,9 @@ do_install() {

        install -m 0644 *Unix*.h ${D}${includedir}/tcl-${PV}/unix/
        rm -f ${D}${includedir}/regex.h
        ln -sf tclsh8.5 ${D}${bindir}/tclsh
+       # trick: We set it to incorrect value but binconfig will fix it
+       # correctly for both target and staging package.
+       sed -i 's:${includedir}/tcl-private:${STAGING_INCDIR}/tcl-${PV}:' ${D}${libdir}/tclConfig.sh }

 PACKAGES =+ "${PN}-lib"

recipes/tcltk/tcl_8.5.8.bb +0 -0
@@ -53,8 +55,3 @@ FILES_${PN}-dev += "${libdir}/tclConfig.sh"
 

 BINCONFIG_GLOB = "*Config.sh"
 BBCLASSEXTEND = "native"

recipes/tcltk/tcl_8.5.8.bb

Quoted 5 lines
recipes/tcltk/tcl_8.5.8.bb +0 -5
-
-tcl_sysroot() {
-        sed -i 's:${includedir}/tcl-private:${STAGING_INCDIR}/tcl-${PV}:' tclConfig.sh
-}
-

Hi,

there is still tcl_8.5.8.bb:SYSROOT_PREPROCESS_FUNCS =+ "tcl_sysroot" and removing tcl_sysroot function results in new warning

NOTE: package tcl-native-8.5.8-r9: task do_populate_sysroot: Started
WARNING: Function tcl_sysroot doesn't exist
NOTE: package tcl-native-8.5.8-r9: task do_populate_sysroot: Succeeded

#2 lore raw
Quoted 14 lines · Martin Jansa
Quoted 11 lines · git version control
Module: openembedded.git
Branch: master
Commit: 7c4aeaf7e2a2b96e700cd5230b0e7b415ab08eab
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7c4aeaf7e2a2b96e700cd5230b0e7b415ab08eab
Author: Stanislav Brabec <[email protected]>
Date:   Wed Apr 20 19:55:49 2011 +0000

tcl: Adapt tclConfig.sh modification to binconfig.class change.

Quoted 7 lines

there is still tcl_8.5.8.bb:SYSROOT_PREPROCESS_FUNCS =+ "tcl_sysroot" and removing tcl_sysroot function results in new warning

NOTE: package tcl-native-8.5.8-r9: task do_populate_sysroot: Started
WARNING: Function tcl_sysroot doesn't exist
NOTE: package tcl-native-8.5.8-r9: task do_populate_sysroot: Succeeded

Thanks. Fixed by fed15638.

Signature · 3 lines
________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus