diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-09-29 20:51:24 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-09-29 20:51:24 +0000 |
| commit | ae3df8736aa5aa88b9c7d7f52f2265bf1fb24ef8 (patch) | |
| tree | f5e9ef8f01457625ae95e4b7e89f89777d5cf9d4 | |
| parent | 07dadf5ebdc456d127dea37b14f8232b466ff64b (diff) | |
| parent | 3123faca484adb68e0bb77de716b00024a82f086 (diff) | |
merge of '5d78367052376f9cb5cf1254ebd88c2b1a03a2e7'
and 'ab8a258812c46a5d12ee3f0b5fc0de34ecc26d38'
| -rw-r--r-- | packages/tcltk/tcl_8.4.11.bb | 4 | ||||
| -rw-r--r-- | packages/tcltk/tk_8.4.11.bb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/tcltk/tcl_8.4.11.bb b/packages/tcltk/tcl_8.4.11.bb index 59d4162e53..f2eed37667 100644 --- a/packages/tcltk/tcl_8.4.11.bb +++ b/packages/tcltk/tcl_8.4.11.bb @@ -2,11 +2,12 @@ DESCRIPTION = "Tool Command Language" LICENSE = "tcl" SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" -PR = "r3" +PR = "r4" SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \ file://tcl-add-soname.patch;patch=1 \ file://fix-configure.patch;patch=1;pnum=2" + S = "${WORKDIR}/tcl${PV}/unix" inherit autotools @@ -25,6 +26,7 @@ do_compile_prepend() { do_stage() { oe_libinstall -a libtclstub8.4 ${STAGING_LIBDIR} oe_libinstall -so libtcl8.4 ${STAGING_LIBDIR} + sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh install -m 0755 tclConfig.sh ${STAGING_BINDIR} cd .. for dir in compat generic unix diff --git a/packages/tcltk/tk_8.4.11.bb b/packages/tcltk/tk_8.4.11.bb index 69a3227437..e70db703e9 100644 --- a/packages/tcltk/tk_8.4.11.bb +++ b/packages/tcltk/tk_8.4.11.bb @@ -4,12 +4,13 @@ SECTION = "devel/tcltk" HOMEPAGE = "http://tcl.sourceforge.net" DEPENDS = "tcl virtual/libx11 libxt" RDEPENDS = "tcl" -PR = "r4" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ file://disable-xim.patch;patch=1;pnum=0 \ file://tk-add-soname.patch;patch=1 \ file://fix-configure.patch;patch=1;pnum=2" + S = "${WORKDIR}/tk${PV}/unix" inherit autotools @@ -25,6 +26,7 @@ do_configure() { do_stage() { oe_libinstall -a libtkstub8.4 ${STAGING_LIBDIR} oe_libinstall -so libtk8.4 ${STAGING_LIBDIR} + sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tkConfig.sh install -m 0755 tkConfig.sh ${STAGING_BINDIR} cd .. #for dir in compat generic unix |