On Mon, May 05, 2014 at 05:51:23PM +0200, Matthieu Crapet wrote:
> Changes:
> - use ${BPN} and ${PV}
> - use ${VER} intermediate variable for readability
> - fulfill LIC_FILES_CHKSUM
> - remove BINCONFIG_GLOB: inherit binconfig is not present, lib/tkConfig.sh
> paths are valid
> - add SSTATE_SCAN_FILES, like it is done in tcl recipe (OE-Core)Does it also fix the tk issues which were shown in all world build reports? > Note: tcl and tk are sharing the same licence, it will be added to OE-Core > soon. > It will drop QA warning. > > Signed-off-by: Matthieu Crapet <[email protected]> > --- > meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb | 40 > ++++++++++++++++++++++-------- > 1 file changed, 29 insertions(+), 11 deletions(-) > > diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb > b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb > index d12973c..58862e7 100644 > --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb > +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb > @@ -1,12 +1,24 @@ > SUMMARY = "Tool Command Language ToolKit Extension" > HOMEPAGE = "http://tcl.sourceforge.net"; > SECTION = "devel/tcltk" > + > +# http://www.tcl.tk/software/tcltk/license.html > LICENSE = "tcl" > -LIC_FILES_CHKSUM = > "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe" > +LIC_FILES_CHKSUM = > "file://../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > + file://../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ > +" > + > DEPENDS = "tcl virtual/libx11 libxt" > > SRC_URI = "\ > - ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ > + ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ > file://confsearch.diff;striplevel=2 \ > file://non-linux.diff;striplevel=2 \ > file://tklibrary.diff;striplevel=2 \ > @@ -16,8 +28,12 @@ SRC_URI = "\ > SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8" > SRC_URI[sha256sum] = > "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6" > > -S = "${WORKDIR}/tk${PV}/unix" > -LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/8.6.0/lib" > +S = "${WORKDIR}/${BPN}${PV}/unix" > + > +# Short version format: "8.6" > +VER = "${@os.path.splitext(d.getVar('PV', True))[0]}" > + > +LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" > inherit autotools > > EXTRA_OECONF = "\ > @@ -28,14 +44,14 @@ EXTRA_OECONF = "\ > " > > do_install_append() { > - ln -sf libtk8.6.so ${D}${libdir}/libtk8.6.so.0 > - oe_libinstall -so libtk8.6 ${D}${libdir} > - ln -sf wish8.6 ${D}${bindir}/wish > - > + ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 > + oe_libinstall -so libtk${VER} ${D}${libdir} > + ln -sf wish${VER} ${D}${bindir}/wish > + > # Even after passing libdir=${libdir} at config, some incorrect dirs are > still generated for the multilib build > if [ "$libdir" != "/usr/lib" ]; then > # Move files to correct library directory > - mv ${D}/usr/lib/tk8.6/* ${D}/${libdir}/tk8.6/ > + mv ${D}/usr/lib/tk${VER}/* ${D}/${libdir}/tk${VER}/ > # Remove unneeded/incorrect dir ('usr/lib/') > rm -rf ${D}/usr/lib > fi > @@ -43,12 +59,14 @@ do_install_append() { > > PACKAGES =+ "${PN}-lib" > > -FILES_${PN}-lib = "${libdir}/libtk8.6.so*" > +FILES_${PN}-lib = "${libdir}/libtk${VER}.so*" > FILES_${PN} += "${libdir}/tk*" > > # isn't getting picked up by shlibs code > RDEPENDS_${PN} += "tk-lib" > RDEPENDS_${PN}_class-native = "" > > -BINCONFIG_GLOB = "*Config.sh" > BBCLASSEXTEND = "native" > + > +# Fix the path in sstate > +SSTATE_SCAN_FILES += "*Config.sh" > -- > 1.8.5.4 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
