mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-04 13:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

tcl: use AUTOTOOLS_SCRIPT_PATH

Browse Source 
Inside tcl the configure.ac is inside a unix/ directory.  Instead of
setting S to BPNPV/unix and having to use ../ to reach files outside of
unix, simply set S as usual and use AUTOTOOLS_SCRIPT_PATH to run the
correct configure script.

(From OE-Core rev: 40516f7db7c29d956038fc74dc7d8c3a7b62325a)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2021-07-09 17:17:38 +01:00
committed by Richard Purdie
parent 4b016a2d47
commit 49474b8edd
6 changed files with 26 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
View File

@@ -18,8 +18,8 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
diff --git a/Makefile.in b/Makefile.in
index 0370491..daa569a 100644
--- a/Makefile.in
+++ b/Makefile.in
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8
@@ -29,32 +29,10 @@ index 0370491..daa569a 100644
# Path to the private tcl header dir:
PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
diff --git a/configure b/configure
index 181b9b3..f4cc225 100755
--- a/configure
+++ b/configure
@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
-PRIVATE_INCLUDE_DIR='$(includedir)'
+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
HTML_DIR='$(DISTDIR)/html'
# Note: in the following variable, it's important to use the absolute
@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
# Install time header dir can be set via --includedir
-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
#------------------------------------------------------------------------
# tclConfig.sh refers to this by a different name
diff --git a/configure.in b/configure.in
index 9f96e2b..e323e02 100644
--- a/configure.in
+++ b/configure.in
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"

4
meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
View File

@@ -17,8 +17,8 @@ Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Index: unix/Makefile.in
===================================================================
--- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
+++ unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
--- a/unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
+++ b/unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
@@ -686,7 +686,7 @@
# tcltest executable gets the build directory burned into its ld search path.
# This keeps tcltest from picking up an already installed version of the Tcl

4
meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
View File

@@ -2,8 +2,8 @@ Upstream-Status: Pending
Index: unix/Makefile.in
===================================================================
--- unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800
+++ unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800
--- a/unix.orig/Makefile.in 2013-11-10 23:37:34.243424934 -0800
+++ b/unix/Makefile.in 2013-11-10 23:37:34.243424934 -0800
@@ -709,23 +709,23 @@
test: test-tcl test-packages

22
meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
View File

@@ -1,23 +1,9 @@
Upstream-Status: Pending
Index: unix/configure
===================================================================
--- unix.orig/configure 2013-09-19 13:17:13.000000000 -0700
+++ unix/configure 2013-11-11 00:20:51.519490342 -0800
@@ -7599,6 +7599,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ # following line added by CW for Debian GNU/Linux
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\${TCL_LIB_FILE}.0"
+
SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
Index: unix/tcl.m4
===================================================================
--- unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700
+++ unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
--- a/unix.orig/tcl.m4 2013-09-19 13:17:13.000000000 -0700
+++ b/unix/tcl.m4 2013-11-11 00:17:24.263485123 -0800
@@ -1415,6 +1415,9 @@
# get rid of the warnings.
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -30,8 +16,8 @@ Index: unix/tcl.m4
DL_LIBS="-ldl"
Index: unix/Makefile.in
===================================================================
--- unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700
+++ unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800
--- a/unix.orig/Makefile.in 2013-09-19 13:17:13.000000000 -0700
+++ b/unix/Makefile.in 2013-11-11 00:20:32.423489861 -0800
@@ -796,7 +796,10 @@
done;
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"

17
meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
View File

@@ -17,23 +17,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
configure.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: unix/configure
===================================================================
--- unix.orig/configure 2013-11-10 23:38:33.643426430 -0800
+++ unix/configure 2013-11-10 23:39:51.347428387 -0800
@@ -19134,7 +19134,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
Index: unix/configure.in
===================================================================
--- unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800
+++ unix/configure.in 2013-11-10 23:39:41.199428131 -0800
--- a/unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800
+++ b/unix/configure.in 2013-11-10 23:39:41.199428131 -0800
@@ -790,7 +790,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"

24
meta/recipes-devtools/tcltk/tcl_8.6.11.bb
View File

@@ -5,12 +5,12 @@ SECTION = "devel/tcltk"
# http://www.tcl.tk/software/tcltk/license.html
LICENSE = "tcl & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://../compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://../library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://../macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://../tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://../win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
LIC_FILES_CHKSUM = "file://license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://library/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://macosx/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://tests/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
file://win/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
"
DEPENDS = "tcl-native zlib"
@@ -28,17 +28,17 @@ SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469
SRC_URI_class-native = "${BASE_SRC_URI}"
S = "${WORKDIR}/${BPN}${PV}/unix"
S = "${WORKDIR}/${BPN}${PV}"
PSEUDO_IGNORE_PATHS .= ",${WORKDIR}/${BPN}${PV}"
VER = "${PV}"
inherit autotools ptest binconfig
AUTOTOOLS_SCRIPT_PATH = "${S}/unix"
EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix"
do_compile_prepend() {
echo > ${S}/../compat/fixstrtod.c
echo > ${S}/compat/fixstrtod.c
}
do_install() {
@@ -53,7 +53,7 @@ do_install() {
install -m 0755 tclConfig.sh ${D}${libdir}
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/
install -m 0644 ${S}/$dir/*.h ${D}${includedir}/${BPN}${VER}/$dir/
done
}
@@ -76,8 +76,8 @@ do_compile_ptest() {
do_install_ptest() {
cp ${B}/tcltest ${D}${PTEST_PATH}
cp -r ${S}/../library ${D}${PTEST_PATH}
cp -r ${S}/../tests ${D}${PTEST_PATH}
cp -r ${S}/library ${D}${PTEST_PATH}
cp -r ${S}/tests ${D}${PTEST_PATH}
}
# Fix some paths that might be used by Tcl extensions