From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Juergen Beisert Date: Mon, 3 Feb 2014 10:59:14 +0100 References: <201401311157.16901.jbe@pengutronix.de> <20140203081202.GE28131@pengutronix.de> In-Reply-To: <20140203081202.GE28131@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201402031059.14359.jbe@pengutronix.de> Subject: [ptxdist] [PATCHv2] TCL: version bump 8.5.7 -> 8.5.15 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Michael Olbrich This update also removes the dependency to a host based TCL shell. = Signed-off-by: Juergen Beisert diff --git a/patches/tcl8.5.7/fix_link_pathes.diff b/patches/tcl8.5.7/fix_l= ink_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 -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 - ---- - unix/configure | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -Index: unix/configure -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- unix/configure.orig -+++ unix/configure -@@ -18911,7 +18911,7 @@ else - TCL_LIB_FLAG=3D"-ltcl`echo ${TCL_VERSION} | tr -d .`" - fi - TCL_BUILD_LIB_SPEC=3D"-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_LIB_FL= AG}" -- TCL_LIB_SPEC=3D"-L${libdir} ${TCL_LIB_FLAG}" -+ TCL_LIB_SPEC=3D"-L$SYSROOT${libdir} ${TCL_LIB_FLAG}" - else - TCL_BUILD_EXP_FILE=3D"lib.exp" - eval "TCL_EXP_FILE=3Dlibtcl${TCL_EXPORT_FILE_SUFFIX}" -@@ -18944,9 +18944,9 @@ if test "$FRAMEWORK_BUILD" =3D "1" ; then - test -z "$TCL_MODULE_PATH" && \ - TCL_MODULE_PATH=3D"~/Library/Tcl /Library/Tcl /System/Library/Tcl" - elif test "$prefix/lib" !=3D "$libdir"; then -- TCL_PACKAGE_PATH=3D"${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}" -+ TCL_PACKAGE_PATH=3D"$SYSROOT${libdir} ${prefix}/lib ${TCL_PACKAGE_PAT= H}" - else -- TCL_PACKAGE_PATH=3D"${prefix}/lib ${TCL_PACKAGE_PATH}" -+ TCL_PACKAGE_PATH=3D"$SYSROOT${prefix}/lib ${TCL_PACKAGE_PATH}" - fi - = - #-------------------------------------------------------------------- -@@ -18968,12 +18968,12 @@ else - fi - = - TCL_BUILD_STUB_LIB_SPEC=3D"-L`pwd | sed -e 's/ /\\\\ /g'` ${TCL_STUB_LIB_= FLAG}" --TCL_STUB_LIB_SPEC=3D"-L${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}" -+TCL_STUB_LIB_SPEC=3D"-L$SYSROOT${TCL_STUB_LIB_DIR} ${TCL_STUB_LIB_FLAG}" - TCL_BUILD_STUB_LIB_PATH=3D"`pwd`/${TCL_STUB_LIB_FILE}" --TCL_STUB_LIB_PATH=3D"${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" -+TCL_STUB_LIB_PATH=3D"$SYSROOT${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" - = - # Install time header dir can be set via --includedir --eval "TCL_INCLUDE_SPEC=3D\"-I${includedir}\"" -+eval "TCL_INCLUDE_SPEC=3D\"-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_h= osts_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 - -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 ---- - unix/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: unix/Makefile.in -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- unix/Makefile.in.orig -+++ unix/Makefile.in -@@ -824,7 +824,7 @@ install-msgs: tclsh - @echo "Installing message catalogs" - @@LD_LIBRARY_PATH_VAR@=3D"`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_L= IBRARY_PATH_VAR@; \ - TCL_LIBRARY=3D"${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) +=3D tcl # TCL_MAJOR :=3D 8 TCL_MINOR :=3D 5 -TCL_PL :=3D 7 +TCL_PL :=3D 15 TCL_VERSION :=3D $(TCL_MAJOR).$(TCL_MINOR).$(TCL_PL) -TCL_MD5 :=3D f70ad8f78b5e4a9f792fe101f22b125f +TCL_MD5 :=3D f3df162f92c69b254079c4d0af7a690f TCL :=3D tcl$(TCL_VERSION) TCL_SUFFIX :=3D -src.tar.gz TCL_URL :=3D $(call ptx/mirror, SF, tcl/$(TCL)$(TCL_SUFFIX)) @@ -31,10 +31,23 @@ TCL_DIR :=3D $(BUILDDIR)/$(TCL) # Prepare # ------------------------------------------------------------------------= ---- = -TCL_PATH :=3D PATH=3D$(CROSS_PATH) +# select one of the available kernel versions + +TCL_KERNEL_VERSION :=3D $(if $(KERNEL_HEADER_VERSION),$(KERNEL_HEADER_VERS= ION),$(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 :=3D \ $(CROSS_ENV) \ - tcl_cv_sys_version=3DLinux-$(KERNEL_HEADER_VERSION) \ + tcl_cv_sys_version=3DLinux-$(TCL_KERNEL_VERSION) \ tcl_cv_strstr_unbroken=3Dyes \ tcl_cv_strtoul_unbroken=3Dyes \ tcl_cv_strtod_unbroken=3Dyes \ @@ -50,21 +63,24 @@ TCL_ENV :=3D \ # TCL_AUTOCONF :=3D \ $(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=3Diso8859-15 \ + --$(call ptx/wwo, PTXCONF_TCL_TZDATA)-tzdata = # TODO: Provide the correct encoding for the target # --with-encoding=3D # Note: TCL uses iso8859-1 until otherwise specified = -ifdef PTXCONF_TCL_THREADS -TCL_AUTOCONF +=3D --enable-threads -else -TCL_AUTOCONF +=3D --disable-threads -endif - TCL_SUBDIR :=3D 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