Core is upgrading TCL to 9.0.0 as well, this has to be done in tandem Rename tk 8.x as tk8 recipe
Signed-off-by: Khem Raj <[email protected]> --- .../tcltk/{tk => tk8}/confsearch.diff | 0 .../tcltk/{tk => tk8}/fix-xft.diff | 0 .../tcltk/{tk => tk8}/tkprivate.diff | 0 .../tcltk/{tk_8.6.15.bb => tk8_8.6.15.bb} | 10 +++++----- .../tcltk/{tk_8.6.15.bb => tk_9.0.0.bb} | 18 ++++++++---------- 5 files changed, 13 insertions(+), 15 deletions(-) rename meta-oe/recipes-devtools/tcltk/{tk => tk8}/confsearch.diff (100%) rename meta-oe/recipes-devtools/tcltk/{tk => tk8}/fix-xft.diff (100%) rename meta-oe/recipes-devtools/tcltk/{tk => tk8}/tkprivate.diff (100%) copy meta-oe/recipes-devtools/tcltk/{tk_8.6.15.bb => tk8_8.6.15.bb} (94%) rename meta-oe/recipes-devtools/tcltk/{tk_8.6.15.bb => tk_9.0.0.bb} (88%) diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff similarity index 100% rename from meta-oe/recipes-devtools/tcltk/tk/confsearch.diff rename to meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff similarity index 100% rename from meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff rename to meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff similarity index 100% rename from meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff rename to meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb similarity index 94% copy from meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb copy to meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb index 1438a05625..f277b86d91 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb +++ b/meta-oe/recipes-devtools/tcltk/tk8_8.6.15.bb @@ -15,10 +15,10 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ " -DEPENDS = "tcl virtual/libx11 libxt" +DEPENDS = "tcl8 virtual/libx11 libxt" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ + ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \ file://confsearch.diff \ file://tkprivate.diff \ file://fix-xft.diff \ @@ -29,13 +29,13 @@ SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"; UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" -S = "${WORKDIR}/${BPN}${PV}" +S = "${WORKDIR}/tk${PV}" # Short version format: "8.6" VER = "${@os.path.splitext(d.getVar('PV'))[0]}" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" - +CFLAGS += "-I${STAGING_INCDIR}/tcl${VER}" inherit autotools features_check pkgconfig AUTOTOOLS_SCRIPT_PATH = "${S}/unix" @@ -73,7 +73,7 @@ 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} += "tk8-lib" RDEPENDS:${PN}:class-native = "" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb b/meta-oe/recipes-devtools/tcltk/tk_9.0.0.bb similarity index 88% rename from meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb rename to meta-oe/recipes-devtools/tcltk/tk_9.0.0.bb index 1438a05625..7deba151f7 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_9.0.0.bb @@ -15,16 +15,12 @@ LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ " -DEPENDS = "tcl virtual/libx11 libxt" +DEPENDS = "tcl virtual/libx11 libxt zip-native" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ - file://confsearch.diff \ - file://tkprivate.diff \ - file://fix-xft.diff \ " - -SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec" +SRC_URI[sha256sum] = "f166e3c20773c82243f753cef4b091d05267cb7f87da64be88cb2ca5a2ba027e" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"; UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" @@ -44,7 +40,6 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/unix" REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF = "\ - --enable-threads \ --with-x \ --with-tcl=${STAGING_BINDIR}/crossscripts \ --libdir=${libdir} \ @@ -53,8 +48,6 @@ EXTRA_OECONF = "\ export TK_LIBRARY='${libdir}/tk${VER}' 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 sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tkConfig.sh @@ -69,7 +62,10 @@ PACKAGECONFIG[xss] = "--enable-xss,--disable-xss,libxscrnsaver libxext" PACKAGES =+ "${PN}-lib" -FILES:${PN}-lib = "${libdir}/libtk${VER}.so*" +SOLIBS = ".so" +FILES_SOLIBSDEV = "" + +FILES:${PN}-lib = "${libdir}/libtcl9tk${VER}.so*" FILES:${PN} += "${libdir}/tk*" # isn't getting picked up by shlibs code @@ -96,6 +92,8 @@ tcl_package_preprocess() { -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ -e "s;${STAGING_INCDIR};${includedir};g" \ -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + -e "s;${B};${libdir};g" \ + -e "s;${WORKDIR};${TARGET_DBGSRC_DIR};g" \ ${PKGD}${libdir}/tkConfig.sh rm -f ${PKGD}${bindir_crossscripts}/tkConfig.sh
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#113930): https://lists.openembedded.org/g/openembedded-devel/message/113930 Mute This Topic: https://lists.openembedded.org/mt/109688574/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
