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>
This commit is contained in:
Kai Kang 2013-06-20 21:38:24 +08:00 committed by Richard Purdie
parent c5a5d23ec4
commit a58a1e63d7
2 changed files with 40 additions and 2 deletions

View File

@ -0,0 +1,37 @@
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/.
Upsteam Status: Inappropriate [configuration]
Signed-off-by: Song.Li <Song.Li@windriver.com>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 478a4d5..79c2979 100755
--- a/configure
+++ b/configure
@@ -18772,7 +18772,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
PRIVATE_INCLUDE_DIR='$(includedir)'
HTML_DIR='$(DISTDIR)/html'
--
1.7.9.5

View File

@ -17,7 +17,8 @@ BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
SRC_URI = "${BASE_SRC_URI} \
file://fix_non_native_build_issue.patch \
file://fix_issue_with_old_distro_glibc.patch \
file://no_packages.patch"
file://no_packages.patch \
file://tcl-remove-hardcoded-install-path.patch"
SRC_URI[md5sum] = "573aa5fe678e9185ef2b3c56b24658d3"
SRC_URI[sha256sum] = "354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade"
@ -65,7 +66,7 @@ tcl_sysroot_preprocess () {
PACKAGES =+ "tcl-lib"
FILES_tcl-lib = "${libdir}/libtcl8.6.so*"
FILES_${PN} += "${prefix}/lib/tcl8.6 ${prefix}/lib/tcl8"
FILES_${PN} += "${libdir}/tcl8.6 ${libdir}/tcl8"
FILES_${PN}-dev += "${libdir}/tclConfig.sh ${libdir}/tclooConfig.sh"
# isn't getting picked up by shlibs code