Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[7194] branches/1.0/package/tcl
|
From: <abe...@us...> - 2015-08-15 21:55:38
|
Revision: 7194
http://sourceforge.net/p/astlinux/code/7194
Author: abelbeck
Date: 2015-08-15 21:55:36 +0000 (Sat, 15 Aug 2015)
Log Message:
-----------
host-tcl, version bump to 8.6.3
Modified Paths:
--------------
branches/1.0/package/tcl/Config.in
branches/1.0/package/tcl/tcl.mk
Added Paths:
-----------
branches/1.0/package/tcl/tcl-0001-dont-build-compat.patch
Removed Paths:
-------------
branches/1.0/package/tcl/tcl-8.4.19-strtod.patch
Modified: branches/1.0/package/tcl/Config.in
===================================================================
--- branches/1.0/package/tcl/Config.in 2015-08-13 23:37:17 UTC (rev 7193)
+++ branches/1.0/package/tcl/Config.in 2015-08-15 21:55:36 UTC (rev 7194)
@@ -5,10 +5,11 @@
http://www.tcl.tk
+if BR2_PACKAGE_TCL
+
config BR2_PACKAGE_TCL_DEL_ENCODINGS
bool "delete encodings (saves 1.4Mb)"
default y
- depends on BR2_PACKAGE_TCL
help
Delete encoding files for TCL. If your programs do not use
various tcl character recoding functions, you may safely
@@ -19,9 +20,10 @@
config BR2_PACKAGE_TCL_SHLIB_ONLY
bool "install only shared library"
default y
- depends on BR2_PACKAGE_TCL
help
Install only TCL shared library and not binary tcl
interpreter(tclsh8.4).
Saves ~14kb.
+
+endif
Added: branches/1.0/package/tcl/tcl-0001-dont-build-compat.patch
===================================================================
--- branches/1.0/package/tcl/tcl-0001-dont-build-compat.patch (rev 0)
+++ branches/1.0/package/tcl/tcl-0001-dont-build-compat.patch 2015-08-15 21:55:36 UTC (rev 7194)
@@ -0,0 +1,33 @@
+From: Andrew Ruder <and...@el...>
+Subject: [PATCH] Disable tcl compatibility layers
+
+Turn off building compatibility layers for old/broken versions of
+standard functions (strstr, strtoul, strtod) with the assumption that
+anything buildroot is using as a standard C library will be good enough
+to not have broken behavior.
+
+Signed-off-by: Andrew Ruder <and...@el...>
+---
+
+diff --git a/unix/tcl.m4 b/unix/tcl.m4
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -2464,7 +2464,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [
+ }
+ exit(0);
+ }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy,
+- tcl_cv_strtod_buggy=buggy)])
++ tcl_cv_strtod_buggy=ok)])
+ if test "$tcl_cv_strtod_buggy" = buggy; then
+ AC_LIBOBJ([fixstrtod])
+ USE_COMPAT=1
+@@ -2723,7 +2723,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[
+ if test ["$tcl_ok"] = 1; then
+ AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken],
+ AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok,
+- [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown))
++ [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=ok))
+ if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then
+ tcl_ok=1
+ else
+
Deleted: branches/1.0/package/tcl/tcl-8.4.19-strtod.patch
===================================================================
--- branches/1.0/package/tcl/tcl-8.4.19-strtod.patch 2015-08-13 23:37:17 UTC (rev 7193)
+++ branches/1.0/package/tcl/tcl-8.4.19-strtod.patch 2015-08-15 21:55:36 UTC (rev 7194)
@@ -1,11 +0,0 @@
---- tcl8.4.9/compat/strtod.c 2002-02-25 16:26:12.000000000 +0200
-+++ tcl8.4.9/compat/strtod.c 2005-05-30 08:55:18.000000000 +0300
-@@ -24,6 +24,8 @@
- #define NULL 0
- #endif
-
-+#undef strtod
-+
- static int maxExponent = 511; /* Largest possible base 10 exponent. Any
- * exponent larger than this will already
- * produce underflow or overflow, so there's
Modified: branches/1.0/package/tcl/tcl.mk
===================================================================
--- branches/1.0/package/tcl/tcl.mk 2015-08-13 23:37:17 UTC (rev 7193)
+++ branches/1.0/package/tcl/tcl.mk 2015-08-15 21:55:36 UTC (rev 7194)
@@ -1,27 +1,93 @@
-#############################################################
+################################################################################
#
-# TCL8.4
+# tcl
#
-#############################################################
-TCL_VERSION:=8.4.19
-TCL_SOURCE:=tcl$(TCL_VERSION)-src.tar.gz
-TCL_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
+################################################################################
+
+TCL_VERSION_MAJOR = 8.6
+TCL_VERSION = $(TCL_VERSION_MAJOR).3
+TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
+TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
TCL_SUBDIR = unix
+TCL_INSTALL_STAGING = YES
+TCL_AUTORECONF = YES
+
+# Note that --with-system-sqlite will only make a difference
+# in the sqlite package (which gets removed if sqlite not
+# configured). Don't need to worry about conditionally including
+# it in the configure options
TCL_CONF_OPT = \
- --disable-symbols \
- --disable-langinfo \
- --disable-framework
+ --disable-symbols \
+ --disable-langinfo \
+ --disable-framework \
+ --with-system-sqlite
-define TCL_POST_INSTALL_CLEANUP
- -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
- -if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
- rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \
- fi
- -if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" = "y" ]; then \
- rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \
- fi
+HOST_TCL_SUBDIR = unix
+
+HOST_TCL_CONF_OPT = \
+ --disable-symbols \
+ --disable-langinfo \
+ --disable-framework
+
+# I haven't found a good way to force pkgs to not build
+# or configure without just removing the entire pkg directory.
+define HOST_TCL_REMOVE_PACKAGES
+ rm -fr $(@D)/pkgs/sqlite[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbc[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbcmysql[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbcodbc[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbcsqlite3-[0-9].[0-9].[0-9]
endef
+HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
+define TCL_REMOVE_PACKAGES
+ rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite[0-9].[0-9].[0-9]) \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc[0-9].[0-9].[0-9]) \
+ $(@D)/pkgs/tdbcmysql[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbcodbc[0-9].[0-9].[0-9] \
+ $(@D)/pkgs/tdbcpostgres[0-9].[0-9].[0-9] \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-[0-9].[0-9].[0-9])
+endef
+TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
-TCL_POST_INSTALL_TARGET_HOOKS += TCL_POST_INSTALL_CLEANUP
+ifeq ($(BR2_PACKAGE_TCL_DEL_ENCODINGS),y)
+define TCL_REMOVE_ENCODINGS
+ rm -rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_ENCODINGS
+endif
+ifeq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
+define TCL_REMOVE_TCLSH
+ rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_TCLSH
+else
+define TCL_SYMLINK_TCLSH
+ ln -sf tclsh$(TCL_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/tclsh
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH
+endif
+
+define HOST_TCL_SYMLINK_TCLSH
+ ln -sf tclsh$(TCL_VERSION_MAJOR) $(HOST_DIR)/usr/bin/tclsh
+endef
+HOST_TCL_POST_INSTALL_HOOKS += HOST_TCL_SYMLINK_TCLSH
+
+# Until someone needs it, we don't handle locale installation. tcl has
+# a complicated method of translating LANG-style locale names into its internal
+# .msg name which makes it difficult to save the correct locales per the
+# configured whitelist.
+define TCL_REMOVE_EXTRA
+ rm -fr $(TARGET_DIR)/usr/lib/tclConfig.sh \
+ $(TARGET_DIR)/usr/lib/tclooConfig.sh \
+ $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/tclAppInit.c \
+ $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/msgs
+endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA
+
+TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
+HOST_TCL_DEPENDENCIES =
+
$(eval $(call AUTOTARGETS,package,tcl))
+$(eval $(call AUTOTARGETS,package,tcl,host))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
