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/tcl-remove-hardcoded-install-path.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/tcl-remove-hardcoded-install-path.patch')
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch index 16f7c80516..17d251d554 100644 --- a/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch +++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch | |||
| @@ -14,10 +14,11 @@ Upstream-Status: Inappropriate [configuration] | |||
| 14 | 14 | ||
| 15 | Signed-off-by: Song.Li <Song.Li@windriver.com> | 15 | Signed-off-by: Song.Li <Song.Li@windriver.com> |
| 16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | 16 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 17 | 17 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |
| 18 | --- | 18 | --- |
| 19 | configure | 2 +- | 19 | configure | 2 +- |
| 20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | configure.in | 2 +- |
| 21 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 21 | 22 | ||
| 22 | Index: unix/configure | 23 | Index: unix/configure |
| 23 | =================================================================== | 24 | =================================================================== |
| @@ -27,8 +28,8 @@ Index: unix/configure | |||
| 27 | 28 | ||
| 28 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 29 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
| 29 | 30 | ||
| 30 | -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' | 31 | -test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' |
| 31 | +TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | 32 | +test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
| 32 | PRIVATE_INCLUDE_DIR='$(includedir)' | 33 | PRIVATE_INCLUDE_DIR='$(includedir)' |
| 33 | HTML_DIR='$(DISTDIR)/html' | 34 | HTML_DIR='$(DISTDIR)/html' |
| 34 | 35 | ||
| @@ -40,8 +41,8 @@ Index: unix/configure.in | |||
| 40 | 41 | ||
| 41 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 42 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
| 42 | 43 | ||
| 43 | -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' | 44 | -test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' |
| 44 | +TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | 45 | +test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
| 45 | PRIVATE_INCLUDE_DIR='$(includedir)' | 46 | PRIVATE_INCLUDE_DIR='$(includedir)' |
| 46 | HTML_DIR='$(DISTDIR)/html' | 47 | HTML_DIR='$(DISTDIR)/html' |
| 47 | 48 | ||