mirror of
https://git.yoctoproject.org/poky
synced 2026-02-11 11:13:04 +01:00
b8ce0c92e2
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>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From 6efc98774681795712073c2b91e5e9d1763239b8 Mon Sep 17 00:00:00 2001
|
|
From: "Song.Li" <Song.Li@windriver.com>
|
|
Date: Wed, 1 Aug 2012 19:05:51 +0800
|
|
Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target
|
|
|
|
Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}.
|
|
|
|
[YOCTO #2876]
|
|
|
|
This is not a bug, but libraries should be installed into directory .../lib/.
|
|
On 64bit target that should be lib64/.
|
|
|
|
Upstream-Status: Inappropriate [configuration]
|
|
|
|
Signed-off-by: Song.Li <Song.Li@windriver.com>
|
|
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
---
|
|
configure | 2 +-
|
|
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
|
|
@@ -790,7 +790,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'
|
|
|