diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2019-12-12 13:55:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-16 23:25:49 +0000 |
| commit | b8ce0c92e27819cd3afab2fd6665325c3555a6c4 (patch) | |
| tree | 22b1e80c8e36076588ba27c8181fbdde05bac3ab /meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | |
| parent | 6c655dd32fffeb06744350d9dbdcf72c7e86b949 (diff) | |
| download | poky-b8ce0c92e27819cd3afab2fd6665325c3555a6c4.tar.gz | |
tcl: upgrade 8.6.9 -> 8.6.10
Refresh patches:
alter-includedir.patch
tcl-remove-hardcoded-install-path.patch
Backport a patch to fix tk build failure with cross compile:
0001-Fix-abd4abedd2-Failed-to-build-tk-8.6.10-with-cross-.patch
See:
https://core.tcl-lang.org/tk/tktview/abd4abedd2f01c12839f0ad94564ae31137f7af5
(From OE-Core rev: f7226d8b28d7ee9292c53c8830c86c0619910f23)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/alter-includedir.patch')
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index c8530e1f58..86632d9144 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | |||
| @@ -8,6 +8,7 @@ Signed-off-by: Khem Raj <raj.khem@gmai.com> | |||
| 8 | Fixed the TCL_INCLUDE_SPEC | 8 | Fixed the TCL_INCLUDE_SPEC |
| 9 | 9 | ||
| 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 11 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 11 | --- | 12 | --- |
| 12 | Makefile.in | 2 +- | 13 | Makefile.in | 2 +- |
| 13 | configure | 4 ++-- | 14 | configure | 4 ++-- |
| @@ -34,7 +35,7 @@ index 3e78b49..24b3f92 100755 | |||
| 34 | @@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" | 35 | @@ -19134,7 +19134,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
| 35 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 36 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
| 36 | 37 | ||
| 37 | TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | 38 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
| 38 | -PRIVATE_INCLUDE_DIR='$(includedir)' | 39 | -PRIVATE_INCLUDE_DIR='$(includedir)' |
| 39 | +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' | 40 | +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' |
| 40 | HTML_DIR='$(DISTDIR)/html' | 41 | HTML_DIR='$(DISTDIR)/html' |
| @@ -56,7 +57,7 @@ index 0e28b14..62d9b41 100755 | |||
| 56 | @@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" | 57 | @@ -791,7 +791,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
| 57 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 58 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
| 58 | 59 | ||
| 59 | TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | 60 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
| 60 | -PRIVATE_INCLUDE_DIR='$(includedir)' | 61 | -PRIVATE_INCLUDE_DIR='$(includedir)' |
| 61 | +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' | 62 | +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' |
| 62 | HTML_DIR='$(DISTDIR)/html' | 63 | HTML_DIR='$(DISTDIR)/html' |
