diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-09-29 20:33:45 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-09-29 20:33:45 +0000 |
| commit | 3123faca484adb68e0bb77de716b00024a82f086 (patch) | |
| tree | 053de84a76cdd4a172d5166355405e51cfe44a49 | |
| parent | fcfd06f1b5a0bea5854a50545b3fc102307d6df5 (diff) | |
| parent | c62509d5242fcec2865b0115aae60435239db294 (diff) | |
merge of '1413d095164c683305cfc29d3e275c6cd0aff5c2'
and 'c08c1b4bb94a697cdae713e266562bb43944ba77'
| -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 |