summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
blob: 17d251d5549ebd930196989e39dafb49826cdd00 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
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'