diff options
| author | Kai Kang <kai.kang@windriver.com> | 2013-06-20 21:38:24 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-20 15:11:55 +0100 |
| commit | ec06d828d8ee623b0064713583344db84496ef1e (patch) | |
| tree | a21927895b19719fee2a33f106dfd437ccdd53db | |
| parent | c659903841da7aa44675d2970d1b92841b91d29e (diff) | |
| download | openembedded-core-ec06d828d8ee623b0064713583344db84496ef1e.tar.gz openembedded-core-ec06d828d8ee623b0064713583344db84496ef1e.tar.bz2 openembedded-core-ec06d828d8ee623b0064713583344db84496ef1e.zip | |
tcl: remove hardcoded library install path
Remove hardcoded library install path and then install library to
${libdir}.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.0.bb | 5 |
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 @@ +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 + 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 \ 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 |