From b955bbbba493360f6ea30717b349468fc959a1b5 Mon Sep 17 00:00:00 2001 From: Huang Qiyu Date: Tue, 13 Feb 2018 13:48:07 +0800 Subject: tk: 8.6.6 -> 8.6.8 1.Upgrade tk from 8.6.6 to 8.6.8. 2.Modify confsearch.diff, since the data has been changed. Signed-off-by: Huang Qiyu Signed-off-by: Armin Kuster --- meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | 17 +++-- meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb | 79 ----------------------- meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb | 79 +++++++++++++++++++++++ 3 files changed, 89 insertions(+), 86 deletions(-) delete mode 100644 meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb create mode 100644 meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index c51e475426..4dbd9a4f16 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -4,29 +4,32 @@ installation. --- tk8.5-8.5.8.orig/unix/configure +++ tk8.5-8.5.8/unix/configure -@@ -1431,6 +1431,7 @@ - `ls -d ${prefix}/lib 2>/dev/null` \ - `ls -d /usr/local/lib 2>/dev/null` \ +@@ -1431,7 +1431,8 @@ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/local/lib 2>/dev/null` \ + `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then --- tk8.5-8.5.8.orig/unix/tcl.m4 +++ tk8.5-8.5.8/unix/tcl.m4 -@@ -93,6 +93,7 @@ - `ls -d ${prefix}/lib 2>/dev/null` \ - `ls -d /usr/local/lib 2>/dev/null` \ +@@ -93,7 +93,8 @@ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/local/lib 2>/dev/null` \ + `ls -d /usr/pkg/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tclConfig.sh" ; then -@@ -223,6 +224,7 @@ +@@ -223,7 +224,8 @@ `ls -d ${prefix}/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \ + `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \ + `ls -d /usr/lib64 2>/dev/null` \ ; do if test -f "$i/tkConfig.sh" ; then diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb deleted file mode 100644 index d3bf397b48..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb +++ /dev/null @@ -1,79 +0,0 @@ -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 \ - 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/${BPN}${PV}-src.tar.gz \ - file://confsearch.diff;striplevel=2 \ - file://non-linux.diff;striplevel=2 \ - file://tklibrary.diff;striplevel=2 \ - file://tkprivate.diff;striplevel=2 \ - file://fix-xft.diff \ - file://configure.use.fontconfig.with.xft.patch \ -" -SRC_URI[md5sum] = "dd7dbb3a6523c42d05f6ab6e86096e99" -SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d" - -S = "${WORKDIR}/${BPN}${PV}/unix" - -# Short version format: "8.6" -VER = "${@os.path.splitext(d.getVar('PV'))[0]}" - -LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" -inherit autotools distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF = "\ - --enable-threads \ - --with-x \ - --with-tcl=${STAGING_BINDIR_CROSS} \ - --libdir=${libdir} \ -" - -do_install_append() { - 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/tk${VER}/* ${D}/${libdir}/tk${VER}/ - # Remove unneeded/incorrect dir ('usr/lib/') - rm -rf ${D}/usr/lib - fi -} - -PACKAGECONFIG ??= "xft" -PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" -PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" - -PACKAGES =+ "${PN}-lib" - -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 = "" - -BBCLASSEXTEND = "native" - -# Fix the path in sstate -SSTATE_SCAN_FILES += "*Config.sh" diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb new file mode 100644 index 0000000000..13dc4d7513 --- /dev/null +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb @@ -0,0 +1,79 @@ +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 \ + 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/${BPN}${PV}-src.tar.gz \ + file://confsearch.diff;striplevel=2 \ + file://non-linux.diff;striplevel=2 \ + file://tklibrary.diff;striplevel=2 \ + file://tkprivate.diff;striplevel=2 \ + file://fix-xft.diff \ + file://configure.use.fontconfig.with.xft.patch \ +" +SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba" +SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" + +S = "${WORKDIR}/${BPN}${PV}/unix" + +# Short version format: "8.6" +VER = "${@os.path.splitext(d.getVar('PV'))[0]}" + +LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" +inherit autotools distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = "\ + --enable-threads \ + --with-x \ + --with-tcl=${STAGING_BINDIR_CROSS} \ + --libdir=${libdir} \ +" + +do_install_append() { + 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/tk${VER}/* ${D}/${libdir}/tk${VER}/ + # Remove unneeded/incorrect dir ('usr/lib/') + rm -rf ${D}/usr/lib + fi +} + +PACKAGECONFIG ??= "xft" +PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,xft" +PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" + +PACKAGES =+ "${PN}-lib" + +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 = "" + +BBCLASSEXTEND = "native" + +# Fix the path in sstate +SSTATE_SCAN_FILES += "*Config.sh" -- cgit 1.2.3-korg