summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/tcltk
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2013-06-20 21:38:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-20 15:12:21 +0100
commita58a1e63d70b349b0be65d94abe426871dcbb090 (patch)
tree37e44ab7fdeab6642ffa3f7dc4a6e8d773b5b97c /meta/recipes-devtools/tcltk
parentc5a5d23ec4850a7b2f307096117eece7e87f11ed (diff)
downloadpoky-a58a1e63d70b349b0be65d94abe426871dcbb090.tar.gz
tcl: remove hardcoded library install path
Remove hardcoded library install path and then install library to ${libdir}. (From OE-Core rev: ec06d828d8ee623b0064713583344db84496ef1e) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/tcltk')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch37
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.0.bb5
2 files changed, 40 insertions, 2 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
new file mode 100644
index 0000000000..9afca5e259
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
@@ -0,0 +1,37 @@
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
13Upsteam Status: Inappropriate [configuration]
14
15Signed-off-by: Song.Li <Song.Li@windriver.com>
16Signed-off-by: Kai Kang <kai.kang@windriver.com>
17
18---
19 configure | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/configure b/configure
23index 478a4d5..79c2979 100755
24--- a/configure
25+++ b/configure
26@@ -18772,7 +18772,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
27
28 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
29
30-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
31+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
32 PRIVATE_INCLUDE_DIR='$(includedir)'
33 HTML_DIR='$(DISTDIR)/html'
34
35--
361.7.9.5
37
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.0.bb b/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
index 7648a817e8..95556e2a64 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
@@ -17,7 +17,8 @@ BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
17SRC_URI = "${BASE_SRC_URI} \ 17SRC_URI = "${BASE_SRC_URI} \
18 file://fix_non_native_build_issue.patch \ 18 file://fix_non_native_build_issue.patch \
19 file://fix_issue_with_old_distro_glibc.patch \ 19 file://fix_issue_with_old_distro_glibc.patch \
20 file://no_packages.patch" 20 file://no_packages.patch \
21 file://tcl-remove-hardcoded-install-path.patch"
21 22
22SRC_URI[md5sum] = "573aa5fe678e9185ef2b3c56b24658d3" 23SRC_URI[md5sum] = "573aa5fe678e9185ef2b3c56b24658d3"
23SRC_URI[sha256sum] = "354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade" 24SRC_URI[sha256sum] = "354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade"
@@ -65,7 +66,7 @@ tcl_sysroot_preprocess () {
65 66
66PACKAGES =+ "tcl-lib" 67PACKAGES =+ "tcl-lib"
67FILES_tcl-lib = "${libdir}/libtcl8.6.so*" 68FILES_tcl-lib = "${libdir}/libtcl8.6.so*"
68FILES_${PN} += "${prefix}/lib/tcl8.6 ${prefix}/lib/tcl8" 69FILES_${PN} += "${libdir}/tcl8.6 ${libdir}/tcl8"
69FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh" 70FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
70 71
71# isn't getting picked up by shlibs code 72# isn't getting picked up by shlibs code