Patchwork [1/1] tcl: remove hardcoded library install path

login
register
mail settings
Submitter Kang Kai
Date June 20, 2013, 1:24 p.m.
Message ID <91dd40249c4291e863bb94f9a97245f80e58c0fe.1371734594.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/52123/
State New
Headers show

Comments

Kang Kai - June 20, 2013, 1:24 p.m.
Fix unit test clock.test fails with boundary year 2099.

Remove hardcoded library install path and then install library to
${libdir}.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../tcltk/tcl/let-DST-include-year-2099.patch      |   35 ++++++++++++++++++
 .../tcl/tcl-remove-hardcoded-install-path.patch    |   37 ++++++++++++++++++++
 meta/recipes-devtools/tcltk/tcl_8.6.0.bb           |    6 ++-
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/tcltk/tcl/let-DST-include-year-2099.patch
 create mode 100644 meta/recipes-devtools/tcltk/tcl/tcl-remove-hardcoded-install-path.patch
Ross Burton - June 20, 2013, 1:28 p.m.
On 20 June 2013 14:24, Kai Kang <kai.kang@windriver.com> wrote:
> Fix unit test clock.test fails with boundary year 2099.
>
> Remove hardcoded library install path and then install library to
> ${libdir}.

Please split these into two patches, as the summary doesn't mention
the patch at all.

Ross
Kang Kai - June 20, 2013, 1:29 p.m.
On 2013?06?20? 21:28, Burton, Ross wrote:
> On 20 June 2013 14:24, Kai Kang <kai.kang@windriver.com> wrote:
>> Fix unit test clock.test fails with boundary year 2099.
>>
>> Remove hardcoded library install path and then install library to
>> ${libdir}.
> Please split these into two patches, as the summary doesn't mention
> the patch at all.
OK, thanks.

>
> Ross
>
>

Patch

diff --git a/meta/recipes-devtools/tcltk/tcl/let-DST-include-year-2099.patch b/meta/recipes-devtools/tcltk/tcl/let-DST-include-year-2099.patch
new file mode 100644
index 0000000..eef1812
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/let-DST-include-year-2099.patch
@@ -0,0 +1,35 @@ 
+From f10135df3f4751d7c83a66561c988ae799b6372f Mon Sep 17 00:00:00 2001
+From: "Song.Li" <Song.Li@windriver.com>
+Date: Fri, 10 Aug 2012 13:07:20 +0800
+Subject: [PATCH] let DST include year 2099
+
+tcl puts Daylight Saving Time in deffect from 1916 to 2099,
+it should include the year 2099,becuase tcl
+self-contained testing have a DST testcase on 2099.
+so the condition statement "<2099" should be "<=2099"
+
+Upstream-Status: Submitted
+
+Signed-off-by: Song.Li <Song.Li@windriver.com>
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+---
+ library/clock.tcl |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/library/clock.tcl b/library/clock.tcl
+index 2e9cae7..e8efe4a 100644
+--- a/library/clock.tcl
++++ b/library/clock.tcl
+@@ -3945,7 +3945,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
+ 
+     # Put DST in effect in all years from 1916 to 2099.
+ 
+-    for { set y 1916 } { $y < 2099 } { incr y } {
++    for { set y 1916 } { $y <= 2099 } { incr y } {
+ 	set startTime [DeterminePosixDSTTime $z start $y]
+ 	incr startTime [expr { - wide($stdOffset) }]
+ 	set endTime [DeterminePosixDSTTime $z end $y]
+-- 
+1.7.9.5
+
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 0000000..9afca5e
--- /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 7648a81..55b48b1 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
@@ -17,7 +17,9 @@  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://let-DST-include-year-2099.patch;patchdir=.. \
+	   file://tcl-remove-hardcoded-install-path.patch"
 
 SRC_URI[md5sum] = "573aa5fe678e9185ef2b3c56b24658d3"
 SRC_URI[sha256sum] = "354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade"
@@ -65,7 +67,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