Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 3b8a17c1d70bac29dd3f1fb727716b7c2151b64a / . / poky / meta / recipes-devtools / tcltk / tcl / tcl-remove-hardcoded-install-path.patch
blob: 17d251d5549ebd930196989e39dafb49826cdd00 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]1From 6efc98774681795712073c2b91e5e9d1763239b8 Mon Sep 17 00:00:00 2001
2From: "Song.Li" <Song.Li@windriver.com>
3Date: Wed, 1 Aug 2012 19:05:51 +0800
4Subject: [PATCH] tcl:install tcl to lib64 instead of lib on 64bit target
5
6Remove hardcoded library install path. Change $(prefix)/lib/ to ${libdir}.
7
8[YOCTO #2876]
9
10This is not a bug, but libraries should be installed into directory .../lib/.
11On 64bit target that should be lib64/.
12
13Upstream-Status: Inappropriate [configuration]
14
15Signed-off-by: Song.Li <Song.Li@windriver.com>
16Signed-off-by: Kai Kang <kai.kang@windriver.com>
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]17Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]18---
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]19 configure | 2 +-
20 configure.in | 2 +-
21 2 files changed, 2 insertions(+), 2 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]22
23Index: unix/configure
24===================================================================
25--- unix.orig/configure 2013-11-10 23:38:33.643426430 -0800
26+++ unix/configure 2013-11-10 23:39:51.347428387 -0800
27@@ -19134,7 +19134,7 @@
28
29 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
30
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]31-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
32+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]33 PRIVATE_INCLUDE_DIR='$(includedir)'
34 HTML_DIR='$(DISTDIR)/html'
35
36Index: unix/configure.in
37===================================================================
38--- unix.orig/configure.in 2013-11-10 23:20:50.000000000 -0800
39+++ unix/configure.in 2013-11-10 23:39:41.199428131 -0800
40@@ -790,7 +790,7 @@
41
42 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
43
Andrew Geissler82c905d2020-04-13 13:39:40 -0500[diff] [blame]44-test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
45+test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]46 PRIVATE_INCLUDE_DIR='$(includedir)'
47 HTML_DIR='$(DISTDIR)/html'
48