mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

tk: set AUTOTOOLS_SCRIPT_PATH instead of having to mess with S/../

Browse Source 
We want to run the configure script in ${S}/unix, so instead of setting
S to BP/unix and then having to use ../ to reach up a level constantly
(including some deep changes to DEBUG_PREFIX_MAP and PSEUDO_IGNORE_PATHS)
we can set S to the top of the source tree as usual and tell autotools
where the configure script is.

This both makes the recipe clearer, and enables tk-src to be generated
correctly.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Ross Burton
2024-10-24 17:44:19 +01:00
committed by Khem Raj
parent c24c8039c9
commit 3c1228e793
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
+2 -2
View File
@@ -1,7 +1,7 @@
Upstream-Status: Pending Upstream-Status: Pending
--- /tmp/configure.in 2010-05-19 13:29:03.000000000 +0200 --- a/unix/configure.in 2010-05-19 13:29:03.000000000 +0200
+++ unix/configure.in 2010-05-19 13:42:05.000000000 +0200 +++ b/unix/configure.in 2010-05-19 13:42:05.000000000 +0200
@@ -526,13 +526,9 @@ @@ -526,13 +526,9 @@
found_xft="yes" found_xft="yes"
dnl make sure package configurator (xft-config or pkg-config dnl make sure package configurator (xft-config or pkg-config
meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb
+18 -16
View File
@@ -4,23 +4,23 @@ SECTION = "devel/tcltk"
# http://www.tcl.tk/software/tcltk/license.html # http://www.tcl.tk/software/tcltk/license.html
LICENSE = "TCL" LICENSE = "TCL"
LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ file://xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
" "
DEPENDS = "tcl virtual/libx11 libxt" DEPENDS = "tcl virtual/libx11 libxt"
SRC_URI = "\ SRC_URI = "\
${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ ${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \
file://confsearch.diff;striplevel=2 \ file://confsearch.diff \
file://tkprivate.diff;striplevel=2 \ file://tkprivate.diff \
file://fix-xft.diff \ file://fix-xft.diff \
" "
@@ -29,17 +29,17 @@ SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca
UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"
S = "${WORKDIR}/${BPN}${PV}/unix" S = "${WORKDIR}/${BPN}${PV}"
DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.."
PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
# Short version format: "8.6" # Short version format: "8.6"
VER = "${@os.path.splitext(d.getVar('PV'))[0]}" VER = "${@os.path.splitext(d.getVar('PV'))[0]}"
LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib" LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/${PV}/lib"
inherit autotools features_check pkgconfig inherit autotools features_check pkgconfig
AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
# depends on virtual/libx11 # depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES = "x11"
@@ -49,7 +49,9 @@ EXTRA_OECONF = "\
--with-tcl=${STAGING_BINDIR}/crossscripts \ --with-tcl=${STAGING_BINDIR}/crossscripts \
--libdir=${libdir} \ --libdir=${libdir} \
" "
export TK_LIBRARY='${libdir}/tk${VER}' export TK_LIBRARY='${libdir}/tk${VER}'
do_install:append() { do_install:append() {
ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0 ln -sf libtk${VER}.so ${D}${libdir}/libtk${VER}.so.0
oe_libinstall -so libtk${VER} ${D}${libdir} oe_libinstall -so libtk${VER} ${D}${libdir}