[ptxdist] [PATCH] TCL: version bump 8.5.7 -> 8.5.15

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH] TCL: version bump 8.5.7 -> 8.5.15
@ 2014-01-31 10:57 Juergen Beisert
  2014-02-03  8:12 ` Michael Olbrich
  0 siblings, 1 reply; 3+ messages in thread
From: Juergen Beisert @ 2014-01-31 10:57 UTC (permalink / raw)
  To: ptxdist

This update also removes the dependency to a host based TCL shell.
    
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/patches/tcl8.5.7/fix_link_pathes.diff b/patches/tcl8.5.7/fix_link_pathes.diff
deleted file mode 100644
index 5f021a8..0000000
--- a/patches/tcl8.5.7/fix_link_pathes.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Juergen Beisert <juergen@kreuzholzen.de>
-Subject: Fix config pathes that confuses TK while building
-
-The config includes many paths into the host. This patch generates paths
-that always points to the local install directories. Short: Make it
-SYSROOT aware.
-
-Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
-
----
- unix/configure |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: unix/configure
-===================================================================
---- unix/configure.orig
-+++ unix/configure
-@@ -18911,7 +18911,7 @@ else
-             TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
-         fi
-         TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
--        TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
-+        TCL_LIB_SPEC="-L$SYSROOT${libdir} ${TCL_LIB_FLAG}"
-     else
-         TCL_BUILD_EXP_FILE="lib.exp"
-         eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -18944,9 +18944,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
-     test -z "$TCL_MODULE_PATH"  && \
- 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
- elif test "$prefix/lib" != "$libdir"; then
--    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="$SYSROOT${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
- else
--    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="$SYSROOT${prefix}/lib ${TCL_PACKAGE_PATH}"
- fi
- 
- #--------------------------------------------------------------------
-@@ -18968,12 +18968,12 @@ else
- fi
- 
- TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
--TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
-+TCL_STUB_LIB_SPEC="-L$SYSROOT${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
- TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
--TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
-+TCL_STUB_LIB_PATH="$SYSROOT${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
- 
- # Install time header dir can be set via --includedir
--eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
-+eval "TCL_INCLUDE_SPEC=\"-I$SYSROOT${includedir}\""
- 
- #------------------------------------------------------------------------
- # tclConfig.sh refers to this by a different name
diff --git a/patches/tcl8.5.7/series b/patches/tcl8.5.7/series
deleted file mode 100644
index 2087077..0000000
--- a/patches/tcl8.5.7/series
+++ /dev/null
@@ -1,2 +0,0 @@
-use_hosts_tclsh.diff -p0
-fix_link_pathes.diff -p0
diff --git a/patches/tcl8.5.7/use_hosts_tclsh.diff b/patches/tcl8.5.7/use_hosts_tclsh.diff
deleted file mode 100644
index 9b51845..0000000
--- a/patches/tcl8.5.7/use_hosts_tclsh.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: [patch] don't use cross compiled tools
-From: Juergen Beisert <juergen@kreuzholzen.de>
-
-Force the install stage to use the host's TCL shell instead
-of its own. This fails badly while cross compiling.
-
-Disadvantage: You need a proper TCL interpreter on the host
-
-FIXME: looks like we need a proper host-tcl
-
-Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
----
- unix/Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: unix/Makefile.in
-===================================================================
---- unix/Makefile.in.orig
-+++ unix/Makefile.in
-@@ -824,7 +824,7 @@ install-msgs: tclsh
- 	@echo "Installing message catalogs"
- 	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
- 	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
--	./tclsh $(TOOL_DIR)/installData.tcl \
-+	tclsh $(TOOL_DIR)/installData.tcl \
- 	    $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
- 
- install-doc: doc
diff --git a/rules/tcl.make b/rules/tcl.make
index 56969f9..b3994d2 100644
--- a/rules/tcl.make
+++ b/rules/tcl.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_TCL) += tcl
 #
 TCL_MAJOR	:= 8
 TCL_MINOR	:= 5
-TCL_PL		:= 7
+TCL_PL		:= 15
 TCL_VERSION	:= $(TCL_MAJOR).$(TCL_MINOR).$(TCL_PL)
-TCL_MD5		:= f70ad8f78b5e4a9f792fe101f22b125f
+TCL_MD5		:= f3df162f92c69b254079c4d0af7a690f
 TCL		:= tcl$(TCL_VERSION)
 TCL_SUFFIX	:= -src.tar.gz
 TCL_URL		:= $(call ptx/mirror, SF, tcl/$(TCL)$(TCL_SUFFIX))
@@ -31,10 +31,28 @@ TCL_DIR		:= $(BUILDDIR)/$(TCL)
 # Prepare
 # ----------------------------------------------------------------------------
 
+ifdef KERNEL_VERSION
+TCL_KERNEL_VERSION := $(KERNEL_VERSION)
+endif
+
+ifdef KERNEL_HEADER_VERSION
+TCL_KERNEL_VERSION := $(KERNEL_HEADER_VERSION)
+endif
+
+ifdef PTXCONF_TCL
+ifeq ($(TCL_KERNEL_VERSION),)
+ $(warning ######################### ERROR ###########################)
+ $(warning # Linux kernel version required in order to make TCL work #)
+ $(warning #   Define a platform kernel or the kernel headers        #)
+ $(warning ###########################################################)
+ $(error )
+endif
+endif
+
 TCL_PATH	:= PATH=$(CROSS_PATH)
 TCL_ENV 	:= \
 	$(CROSS_ENV) \
-	tcl_cv_sys_version=Linux-$(KERNEL_HEADER_VERSION) \
+	tcl_cv_sys_version=Linux-$(TCL_KERNEL_VERSION) \
 	tcl_cv_strstr_unbroken=yes \
 	tcl_cv_strtoul_unbroken=yes \
 	tcl_cv_strtod_unbroken=yes \
@@ -50,21 +68,23 @@ TCL_ENV 	:= \
 #
 TCL_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/endis, PTXCONF_TCL_THREADS)-threads \
+	--enable-shared \
+	--disable-64bit \
+	--disable-64bit-vis \
 	--disable-rpath \
-	--disable-symbols \
+	--disable-corefoundation \
 	--enable-load \
-	--enable-shared
+	--enable-symbols \
+	--enable-dll-unloading \
+	--disable-dtrace \
+	--disable-framework \
+	--with-encoding=iso8859-15 \
+	--$(call ptx/wwo, PTXCONF_TIMEZONE)-tzdata
 
-# TODO: Provide the correct encoding for the target
 # --with-encoding=<valid encode from 'usr/lib/tcl8.5/encoding'>
 # Note: TCL uses iso8859-1 until otherwise specified
 
-ifdef PTXCONF_TCL_THREADS
-TCL_AUTOCONF += --enable-threads
-else
-TCL_AUTOCONF += --disable-threads
-endif
-
 TCL_SUBDIR := unix
 
 # ----------------------------------------------------------------------------
@@ -113,9 +133,9 @@ $(STATEDIR)/tcl.targetinstall:
 ifdef PTXCONF_TCL_TESTING
 	@$(call install_copy, tcl, 0, 0, 0755, /usr/lib/tcl$(TCL_MAJOR))
 	@$(call install_copy, tcl, 0, 0, 0644, -, \
-		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.1.tm)
+		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.5.tm)
 	@$(call install_copy, tcl, 0, 0, 0644, -, \
-		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.4.2.tm)
+		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.5.2.tm)
 
 	@$(call install_copy, tcl, 0, 0, 0644, -, \
 		/usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR)/tm.tcl)
-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [ptxdist] [PATCH] TCL: version bump 8.5.7 -> 8.5.15
  2014-01-31 10:57 [ptxdist] [PATCH] TCL: version bump 8.5.7 -> 8.5.15 Juergen Beisert
@ 2014-02-03  8:12 ` Michael Olbrich
  2014-02-03  9:59   ` [ptxdist] [PATCHv2] " Juergen Beisert
  0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2014-02-03  8:12 UTC (permalink / raw)
  To: ptxdist

On Fri, Jan 31, 2014 at 11:57:16AM +0100, Juergen Beisert wrote:
> This update also removes the dependency to a host based TCL shell.
>     
> Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> 
> diff --git a/patches/tcl8.5.7/fix_link_pathes.diff b/patches/tcl8.5.7/fix_link_pathes.diff
> deleted file mode 100644
> index 5f021a8..0000000
> --- a/patches/tcl8.5.7/fix_link_pathes.diff
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From: Juergen Beisert <juergen@kreuzholzen.de>
> -Subject: Fix config pathes that confuses TK while building
> -
> -The config includes many paths into the host. This patch generates paths
> -that always points to the local install directories. Short: Make it
> -SYSROOT aware.
> -
> -Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
> -
> ----
> - unix/configure |   12 ++++++------
> - 1 file changed, 6 insertions(+), 6 deletions(-)
> -
> -Index: unix/configure
> -===================================================================
> ---- unix/configure.orig
> -+++ unix/configure
> -@@ -18911,7 +18911,7 @@ else
> -             TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
> -         fi
> -         TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
> --        TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
> -+        TCL_LIB_SPEC="-L$SYSROOT${libdir} ${TCL_LIB_FLAG}"
> -     else
> -         TCL_BUILD_EXP_FILE="lib.exp"
> -         eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
> -@@ -18944,9 +18944,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
> -     test -z "$TCL_MODULE_PATH"  && \
> - 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
> - elif test "$prefix/lib" != "$libdir"; then
> --    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
> -+    TCL_PACKAGE_PATH="$SYSROOT${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
> - else
> --    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
> -+    TCL_PACKAGE_PATH="$SYSROOT${prefix}/lib ${TCL_PACKAGE_PATH}"
> - fi
> - 
> - #--------------------------------------------------------------------
> -@@ -18968,12 +18968,12 @@ else
> - fi
> - 
> - TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
> --TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
> -+TCL_STUB_LIB_SPEC="-L$SYSROOT${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
> - TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
> --TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
> -+TCL_STUB_LIB_PATH="$SYSROOT${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
> - 
> - # Install time header dir can be set via --includedir
> --eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
> -+eval "TCL_INCLUDE_SPEC=\"-I$SYSROOT${includedir}\""
> - 
> - #------------------------------------------------------------------------
> - # tclConfig.sh refers to this by a different name
> diff --git a/patches/tcl8.5.7/series b/patches/tcl8.5.7/series
> deleted file mode 100644
> index 2087077..0000000
> --- a/patches/tcl8.5.7/series
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -use_hosts_tclsh.diff -p0
> -fix_link_pathes.diff -p0
> diff --git a/patches/tcl8.5.7/use_hosts_tclsh.diff b/patches/tcl8.5.7/use_hosts_tclsh.diff
> deleted file mode 100644
> index 9b51845..0000000
> --- a/patches/tcl8.5.7/use_hosts_tclsh.diff
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -Subject: [patch] don't use cross compiled tools
> -From: Juergen Beisert <juergen@kreuzholzen.de>
> -
> -Force the install stage to use the host's TCL shell instead
> -of its own. This fails badly while cross compiling.
> -
> -Disadvantage: You need a proper TCL interpreter on the host
> -
> -FIXME: looks like we need a proper host-tcl
> -
> -Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
> ----
> - unix/Makefile.in |    2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -Index: unix/Makefile.in
> -===================================================================
> ---- unix/Makefile.in.orig
> -+++ unix/Makefile.in
> -@@ -824,7 +824,7 @@ install-msgs: tclsh
> - 	@echo "Installing message catalogs"
> - 	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
> - 	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
> --	./tclsh $(TOOL_DIR)/installData.tcl \
> -+	tclsh $(TOOL_DIR)/installData.tcl \
> - 	    $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
> - 
> - install-doc: doc
> diff --git a/rules/tcl.make b/rules/tcl.make
> index 56969f9..b3994d2 100644
> --- a/rules/tcl.make
> +++ b/rules/tcl.make
> @@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_TCL) += tcl
>  #
>  TCL_MAJOR	:= 8
>  TCL_MINOR	:= 5
> -TCL_PL		:= 7
> +TCL_PL		:= 15
>  TCL_VERSION	:= $(TCL_MAJOR).$(TCL_MINOR).$(TCL_PL)
> -TCL_MD5		:= f70ad8f78b5e4a9f792fe101f22b125f
> +TCL_MD5		:= f3df162f92c69b254079c4d0af7a690f
>  TCL		:= tcl$(TCL_VERSION)
>  TCL_SUFFIX	:= -src.tar.gz
>  TCL_URL		:= $(call ptx/mirror, SF, tcl/$(TCL)$(TCL_SUFFIX))
> @@ -31,10 +31,28 @@ TCL_DIR		:= $(BUILDDIR)/$(TCL)
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> +ifdef KERNEL_VERSION
> +TCL_KERNEL_VERSION := $(KERNEL_VERSION)
> +endif
> +
> +ifdef KERNEL_HEADER_VERSION
> +TCL_KERNEL_VERSION := $(KERNEL_HEADER_VERSION)
> +endif

TCL_KERNEL_VERSION := $(call ptx/ifdef, KERNEL_HEADER_VERSION,$(KERNEL_HEADER_VERSION),$(KERNEL_VERSION)

might be a bit shorter.

> +
> +ifdef PTXCONF_TCL
> +ifeq ($(TCL_KERNEL_VERSION),)
> + $(warning ######################### ERROR ###########################)
> + $(warning # Linux kernel version required in order to make TCL work #)
> + $(warning #   Define a platform kernel or the kernel headers        #)
> + $(warning ###########################################################)
> + $(error )
> +endif
> +endif
> +
>  TCL_PATH	:= PATH=$(CROSS_PATH)

drop this line while at it.

>  TCL_ENV 	:= \
>  	$(CROSS_ENV) \
> -	tcl_cv_sys_version=Linux-$(KERNEL_HEADER_VERSION) \
> +	tcl_cv_sys_version=Linux-$(TCL_KERNEL_VERSION) \
>  	tcl_cv_strstr_unbroken=yes \
>  	tcl_cv_strtoul_unbroken=yes \
>  	tcl_cv_strtod_unbroken=yes \
> @@ -50,21 +68,23 @@ TCL_ENV 	:= \
>  #
>  TCL_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
> +	--$(call ptx/endis, PTXCONF_TCL_THREADS)-threads \
> +	--enable-shared \
> +	--disable-64bit \
> +	--disable-64bit-vis \
>  	--disable-rpath \
> -	--disable-symbols \
> +	--disable-corefoundation \
>  	--enable-load \
> -	--enable-shared
> +	--enable-symbols \
> +	--enable-dll-unloading \
> +	--disable-dtrace \
> +	--disable-framework \
> +	--with-encoding=iso8859-15 \
> +	--$(call ptx/wwo, PTXCONF_TIMEZONE)-tzdata

No, this way ptxdist won't recompile when you en-/disable TIMEZONE.

use

config TCL_TZDATA
	default TIMEZONE

>  
> -# TODO: Provide the correct encoding for the target
>  # --with-encoding=<valid encode from 'usr/lib/tcl8.5/encoding'>
>  # Note: TCL uses iso8859-1 until otherwise specified

Any reason, why half of the comment remains?

Michael

>  
> -ifdef PTXCONF_TCL_THREADS
> -TCL_AUTOCONF += --enable-threads
> -else
> -TCL_AUTOCONF += --disable-threads
> -endif
> -
>  TCL_SUBDIR := unix
>  
>  # ----------------------------------------------------------------------------
> @@ -113,9 +133,9 @@ $(STATEDIR)/tcl.targetinstall:
>  ifdef PTXCONF_TCL_TESTING
>  	@$(call install_copy, tcl, 0, 0, 0755, /usr/lib/tcl$(TCL_MAJOR))
>  	@$(call install_copy, tcl, 0, 0, 0644, -, \
> -		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.1.tm)
> +		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.5.tm)
>  	@$(call install_copy, tcl, 0, 0, 0644, -, \
> -		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.4.2.tm)
> +		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.5.2.tm)
>  
>  	@$(call install_copy, tcl, 0, 0, 0644, -, \
>  		/usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR)/tm.tcl)
> -- 
> Pengutronix e.K.                              | Juergen Beisert             |
> Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [ptxdist] [PATCHv2] TCL: version bump 8.5.7 -> 8.5.15
  2014-02-03  8:12 ` Michael Olbrich
@ 2014-02-03  9:59   ` Juergen Beisert
  0 siblings, 0 replies; 3+ messages in thread
From: Juergen Beisert @ 2014-02-03  9:59 UTC (permalink / raw)
  To: ptxdist; +Cc: Michael Olbrich

This update also removes the dependency to a host based TCL shell.
    
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>

diff --git a/patches/tcl8.5.7/fix_link_pathes.diff b/patches/tcl8.5.7/fix_link_pathes.diff
deleted file mode 100644
index 5f021a8..0000000
--- a/patches/tcl8.5.7/fix_link_pathes.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-From: Juergen Beisert <juergen@kreuzholzen.de>
-Subject: Fix config pathes that confuses TK while building
-
-The config includes many paths into the host. This patch generates paths
-that always points to the local install directories. Short: Make it
-SYSROOT aware.
-
-Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
-
----
- unix/configure |   12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: unix/configure
-===================================================================
---- unix/configure.orig
-+++ unix/configure
-@@ -18911,7 +18911,7 @@ else
-             TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`"
-         fi
-         TCL_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FLAG}"
--        TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
-+        TCL_LIB_SPEC="-L$SYSROOT${libdir} ${TCL_LIB_FLAG}"
-     else
-         TCL_BUILD_EXP_FILE="lib.exp"
-         eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -18944,9 +18944,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
-     test -z "$TCL_MODULE_PATH"  && \
- 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
- elif test "$prefix/lib" != "$libdir"; then
--    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="$SYSROOT${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
- else
--    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
-+    TCL_PACKAGE_PATH="$SYSROOT${prefix}/lib ${TCL_PACKAGE_PATH}"
- fi
- 
- #--------------------------------------------------------------------
-@@ -18968,12 +18968,12 @@ else
- fi
- 
- TCL_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_FLAG}"
--TCL_STUB_LIB_SPEC="-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
-+TCL_STUB_LIB_SPEC="-L$SYSROOT${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}"
- TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
--TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
-+TCL_STUB_LIB_PATH="$SYSROOT${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
- 
- # Install time header dir can be set via --includedir
--eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
-+eval "TCL_INCLUDE_SPEC=\"-I$SYSROOT${includedir}\""
- 
- #------------------------------------------------------------------------
- # tclConfig.sh refers to this by a different name
diff --git a/patches/tcl8.5.7/series b/patches/tcl8.5.7/series
deleted file mode 100644
index 2087077..0000000
--- a/patches/tcl8.5.7/series
+++ /dev/null
@@ -1,2 +0,0 @@
-use_hosts_tclsh.diff -p0
-fix_link_pathes.diff -p0
diff --git a/patches/tcl8.5.7/use_hosts_tclsh.diff b/patches/tcl8.5.7/use_hosts_tclsh.diff
deleted file mode 100644
index 9b51845..0000000
--- a/patches/tcl8.5.7/use_hosts_tclsh.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: [patch] don't use cross compiled tools
-From: Juergen Beisert <juergen@kreuzholzen.de>
-
-Force the install stage to use the host's TCL shell instead
-of its own. This fails badly while cross compiling.
-
-Disadvantage: You need a proper TCL interpreter on the host
-
-FIXME: looks like we need a proper host-tcl
-
-Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
----
- unix/Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: unix/Makefile.in
-===================================================================
---- unix/Makefile.in.orig
-+++ unix/Makefile.in
-@@ -824,7 +824,7 @@ install-msgs: tclsh
- 	@echo "Installing message catalogs"
- 	@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
- 	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
--	./tclsh $(TOOL_DIR)/installData.tcl \
-+	tclsh $(TOOL_DIR)/installData.tcl \
- 	    $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
- 
- install-doc: doc
diff --git a/rules/tcl.in b/rules/tcl.in
index e35a5bc..2bbc47f 100644
--- a/rules/tcl.in
+++ b/rules/tcl.in
@@ -50,4 +50,11 @@ config TCL_TESTING
 	  or run the whole suite with '/usr/share/tcl-tests/all.tcl' from
 	  inside a tcl shell.
 
+config TCL_TZDATA
+	bool
+	prompt "enable time zone support"
+        default TIMEZONE
+        help
+           Install timezone data for TCL
+
 endif
diff --git a/rules/tcl.make b/rules/tcl.make
index 56969f9..d965d7e 100644
--- a/rules/tcl.make
+++ b/rules/tcl.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_TCL) += tcl
 #
 TCL_MAJOR	:= 8
 TCL_MINOR	:= 5
-TCL_PL		:= 7
+TCL_PL		:= 15
 TCL_VERSION	:= $(TCL_MAJOR).$(TCL_MINOR).$(TCL_PL)
-TCL_MD5		:= f70ad8f78b5e4a9f792fe101f22b125f
+TCL_MD5		:= f3df162f92c69b254079c4d0af7a690f
 TCL		:= tcl$(TCL_VERSION)
 TCL_SUFFIX	:= -src.tar.gz
 TCL_URL		:= $(call ptx/mirror, SF, tcl/$(TCL)$(TCL_SUFFIX))
@@ -31,10 +31,23 @@ TCL_DIR		:= $(BUILDDIR)/$(TCL)
 # Prepare
 # ----------------------------------------------------------------------------
 
-TCL_PATH	:= PATH=$(CROSS_PATH)
+# select one of the available kernel versions
+
+TCL_KERNEL_VERSION := $(if $(KERNEL_HEADER_VERSION),$(KERNEL_HEADER_VERSION),$(KERNEL_VERSION))
+
+ifdef PTXCONF_TCL
+ifeq ($(TCL_KERNEL_VERSION),)
+ $(warning ######################### ERROR ###########################)
+ $(warning # Linux kernel version required in order to make TCL work #)
+ $(warning #   Define a platform kernel or the kernel headers        #)
+ $(warning ###########################################################)
+ $(error )
+endif
+endif
+
 TCL_ENV 	:= \
 	$(CROSS_ENV) \
-	tcl_cv_sys_version=Linux-$(KERNEL_HEADER_VERSION) \
+	tcl_cv_sys_version=Linux-$(TCL_KERNEL_VERSION) \
 	tcl_cv_strstr_unbroken=yes \
 	tcl_cv_strtoul_unbroken=yes \
 	tcl_cv_strtod_unbroken=yes \
@@ -50,21 +63,24 @@ TCL_ENV 	:= \
 #
 TCL_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
+	--$(call ptx/endis, PTXCONF_TCL_THREADS)-threads \
+	--enable-shared \
+	--disable-64bit \
+	--disable-64bit-vis \
 	--disable-rpath \
-	--disable-symbols \
+	--disable-corefoundation \
 	--enable-load \
-	--enable-shared
+	--enable-symbols \
+	--enable-dll-unloading \
+	--disable-dtrace \
+	--disable-framework \
+	--with-encoding=iso8859-15 \
+	--$(call ptx/wwo, PTXCONF_TCL_TZDATA)-tzdata
 
 # TODO: Provide the correct encoding for the target
 # --with-encoding=<valid encode from 'usr/lib/tcl8.5/encoding'>
 # Note: TCL uses iso8859-1 until otherwise specified
 
-ifdef PTXCONF_TCL_THREADS
-TCL_AUTOCONF += --enable-threads
-else
-TCL_AUTOCONF += --disable-threads
-endif
-
 TCL_SUBDIR := unix
 
 # ----------------------------------------------------------------------------
@@ -90,7 +106,7 @@ $(STATEDIR)/tcl.targetinstall:
 	@$(call install_fixup, tcl,PRIORITY,optional)
 	@$(call install_fixup, tcl,SECTION,base)
 	@$(call install_fixup, tcl,AUTHOR,"Juergen Beisert <juergen@kreuzholzen.de")
-	@$(call install_fixup, tcl,DESCRIPTION,missing)
+	@$(call install_fixup, tcl,DESCRIPTION,"TCL byte code engine")
 
 	@$(call install_copy, tcl, 0, 0, 0755, \
 		/usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR))
@@ -113,9 +129,9 @@ $(STATEDIR)/tcl.targetinstall:
 ifdef PTXCONF_TCL_TESTING
 	@$(call install_copy, tcl, 0, 0, 0755, /usr/lib/tcl$(TCL_MAJOR))
 	@$(call install_copy, tcl, 0, 0, 0644, -, \
-		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.1.tm)
+		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/tcltest-2.3.5.tm)
 	@$(call install_copy, tcl, 0, 0, 0644, -, \
-		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.4.2.tm)
+		/usr/lib/tcl$(TCL_MAJOR)/$(TCL_MAJOR).$(TCL_MINOR)/msgcat-1.5.2.tm)
 
 	@$(call install_copy, tcl, 0, 0, 0644, -, \
 		/usr/lib/tcl$(TCL_MAJOR).$(TCL_MINOR)/tm.tcl)

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-02-03  9:59 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-31 10:57 [ptxdist] [PATCH] TCL: version bump 8.5.7 -> 8.5.15 Juergen Beisert
2014-02-03  8:12 ` Michael Olbrich
2014-02-03  9:59   ` [ptxdist] [PATCHv2] " Juergen Beisert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox