diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/tcltk')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.7.bb (renamed from import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.6.bb) | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.6.bb b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.7.bb index 40cd18fb09..dac73be6e7 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.6.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/tcltk/tcl_8.6.7.bb @@ -24,8 +24,8 @@ SRC_URI = "${BASE_SRC_URI} \ file://alter-includedir.patch \ file://run-ptest \ " -SRC_URI[md5sum] = "5193aea8107839a79df8ac709552ecb7" -SRC_URI[sha256sum] = "a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07" +SRC_URI[md5sum] = "5673aaf45b5de5d8dd80bb3daaeb8838" +SRC_URI[sha256sum] = "7c6b8f84e37332423cfe5bae503440d88450da8cc1243496249faa5268026ba5" SRC_URI_class-native = "${BASE_SRC_URI}" @@ -35,23 +35,15 @@ VER = "${PV}" inherit autotools ptest binconfig -DEPENDS_class-native = "zlib-native" - EXTRA_OECONF = "--enable-threads --disable-rpath --libdir=${libdir}" -do_configure() { - cd ${S} - gnu-configize - cd ${B} - oe_runconf -} - do_compile_prepend() { echo > ${S}/../compat/fixstrtod.c } do_install() { - autotools_do_install install-private-headers + autotools_do_install + oe_runmake 'DESTDIR=${D}' install-private-headers ln -sf ./tclsh${VER} ${D}${bindir}/tclsh ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} sed -i "s;-L${B};-L${STAGING_LIBDIR};g" tclConfig.sh @@ -59,7 +51,6 @@ do_install() { install -d ${D}${bindir_crossscripts} install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} install -m 0755 tclConfig.sh ${D}${libdir} - cd .. for dir in compat generic unix; do install -d ${D}${includedir}/${BPN}${VER}/$dir install -m 0644 ${S}/../$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/ @@ -95,3 +86,16 @@ BINCONFIG_GLOB = "*Config.sh" # Fix the path in sstate SSTATE_SCAN_FILES += "*Config.sh" + +# Cleanup host path from ${libdir}/tclConfig.sh and remove the +# ${bindir_crossscripts}/tclConfig.sh from target +PACKAGE_PREPROCESS_FUNCS += "tcl_package_preprocess" +tcl_package_preprocess() { + sed -i -e "s;${DEBUG_PREFIX_MAP};;g" \ + -e "s;-L${STAGING_LIBDIR};-L${libdir};g" \ + -e "s;${STAGING_INCDIR};${includedir};g" \ + -e "s;--sysroot=${RECIPE_SYSROOT};;g" \ + ${PKGD}${libdir}/tclConfig.sh + + rm -f ${PKGD}${bindir_crossscripts}/tclConfig.sh +} |