summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-10-16 15:41:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-26 15:59:11 +0100
commit3347bc49645d2d8623011e3719f68afb9f3f8d90 (patch)
tree0e59a9efecb9d9582764e547241602d4a0213ece /meta
parent4d68d36dbe6d04e06dcead56b29223dc34eef843 (diff)
downloadpoky-3347bc49645d2d8623011e3719f68afb9f3f8d90.tar.gz
tcl: upgrade to 8.6.1
Following patches were removed/refreshed: * let-DST-include-year-2099.patch - removed, fixed upstream * tcl-add-soname.patch - refreshed (From OE-Core rev: 0d8ff52a4c2e31c28ef9b50a4c3a380cf263992b) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/tcltk/tcl/let-DST-include-year-2099.patch35
-rw-r--r--meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch38
-rw-r--r--meta/recipes-devtools/tcltk/tcl_8.6.1.bb (renamed from meta/recipes-devtools/tcltk/tcl_8.6.0.bb)7
3 files changed, 22 insertions, 58 deletions
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
deleted file mode 100644
index eef18128e1..0000000000
--- a/meta/recipes-devtools/tcltk/tcl/let-DST-include-year-2099.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From f10135df3f4751d7c83a66561c988ae799b6372f Mon Sep 17 00:00:00 2001
2From: "Song.Li" <Song.Li@windriver.com>
3Date: Fri, 10 Aug 2012 13:07:20 +0800
4Subject: [PATCH] let DST include year 2099
5
6tcl puts Daylight Saving Time in deffect from 1916 to 2099,
7it should include the year 2099,becuase tcl
8self-contained testing have a DST testcase on 2099.
9so the condition statement "<2099" should be "<=2099"
10
11Upstream-Status: Submitted
12
13Signed-off-by: Song.Li <Song.Li@windriver.com>
14Signed-off-by: Kai Kang <kai.kang@windriver.com>
15
16---
17 library/clock.tcl | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/library/clock.tcl b/library/clock.tcl
21index 2e9cae7..e8efe4a 100644
22--- a/library/clock.tcl
23+++ b/library/clock.tcl
24@@ -3945,7 +3945,7 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
25
26 # Put DST in effect in all years from 1916 to 2099.
27
28- for { set y 1916 } { $y < 2099 } { incr y } {
29+ for { set y 1916 } { $y <= 2099 } { incr y } {
30 set startTime [DeterminePosixDSTTime $z start $y]
31 incr startTime [expr { - wide($stdOffset) }]
32 set endTime [DeterminePosixDSTTime $z end $y]
33--
341.7.9.5
35
diff --git a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
index eca0a18ec1..d3691f64fc 100644
--- a/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
+++ b/meta/recipes-devtools/tcltk/tcl/tcl-add-soname.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3diff --git unix.orig/configure unix/configure 3Index: unix/configure
4index f778a7b..25083c2 100755 4===================================================================
5--- unix.orig/configure 5--- unix.orig/configure 2013-09-19 23:17:13.000000000 +0300
6+++ unix/configure 6+++ unix/configure 2013-10-16 15:58:37.450136217 +0300
7@@ -6889,6 +6889,7 @@ fi 7@@ -6899,6 +6899,7 @@
8 LIBS="$LIBS -lc" 8 LIBS="$LIBS -lc"
9 SHLIB_CFLAGS="" 9 SHLIB_CFLAGS=""
10 SHLIB_SUFFIX=".so" 10 SHLIB_SUFFIX=".so"
@@ -12,11 +12,19 @@ index f778a7b..25083c2 100755
12 12
13 DL_OBJS="tclLoadDl.o" 13 DL_OBJS="tclLoadDl.o"
14 LD_LIBRARY_PATH_VAR="LIBPATH" 14 LD_LIBRARY_PATH_VAR="LIBPATH"
15diff --git unix.orig/tcl.m4 unix/tcl.m4 15Index: unix/tcl.m4
16index b13fddd..7254f66 100644 16===================================================================
17--- unix.orig/tcl.m4 17--- unix.orig/tcl.m4 2013-09-19 23:17:13.000000000 +0300
18+++ unix/tcl.m4 18+++ unix/tcl.m4 2013-10-16 16:18:50.719586228 +0300
19@@ -1408,12 +1408,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 19@@ -1408,6 +1408,7 @@
20 Linux*|GNU*|NetBSD-Debian)
21 SHLIB_CFLAGS="-fPIC"
22 SHLIB_SUFFIX=".so"
23+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
24
25 CFLAGS_OPTIMIZE="-O2"
26 # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
27@@ -1415,12 +1416,15 @@
20 # get rid of the warnings. 28 # get rid of the warnings.
21 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" 29 #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
22 30
@@ -33,15 +41,7 @@ index b13fddd..7254f66 100644
33 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} 41 LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
34 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"]) 42 AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
35 AS_IF([test $do64bit = yes], [ 43 AS_IF([test $do64bit = yes], [
36@@ -1439,6 +1442,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ 44@@ -2050,7 +2054,7 @@
37 GNU*)
38 SHLIB_CFLAGS="-fPIC"
39 SHLIB_SUFFIX=".so"
40+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.0'
41
42 SHLIB_LD='${CC} -shared'
43 DL_OBJS=""
44@@ -2098,7 +2102,7 @@ dnl # preprocessing tests use only CPPFLAGS.
45 45
46 AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ 46 AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [
47 LIB_SUFFIX=${SHARED_LIB_SUFFIX} 47 LIB_SUFFIX=${SHARED_LIB_SUFFIX}
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.0.bb b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
index 8d4df30f51..e23970848f 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.0.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.1.bb
@@ -19,10 +19,9 @@ SRC_URI = "${BASE_SRC_URI} \
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 file://tcl-remove-hardcoded-install-path.patch \
22 file://let-DST-include-year-2099.patch;patchdir=.. " 22 "
23 23SRC_URI[md5sum] = "aae4b701ee527c6e4e1a6f9c7399882e"
24SRC_URI[md5sum] = "573aa5fe678e9185ef2b3c56b24658d3" 24SRC_URI[sha256sum] = "16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514"
25SRC_URI[sha256sum] = "354422b9c4791685499123b2dfe01faa98b555c08906c010cb4449ddc75dcade"
26 25
27SRC_URI_class-native = "${BASE_SRC_URI}" 26SRC_URI_class-native = "${BASE_SRC_URI}"
28 27